[SPARK-26604][CORE][BACKPORT-1.6] Clean up channel registration for S…#26989

hensg wants to merge 1 commit intoapache:branch-1.6apache/spark:branch-1.6from

hensg:SPARK-26604_cherry_pick_1_6Copy head branch name to clipboard