[SPARK-22211][SQL][FOLLOWUP] Fix bad merge for tests#19701

henryr wants to merge 1 commit intoapache:branch-2.2apache/spark:branch-2.2from

henryr:branch-2.2henryr/spark:branch-2.2Copy head branch name to clipboard