FIX: re-order unit conversion and mask array coercion#19876

QuLogic merged 2 commits intomatplotlib:mastermatplotlib/matplotlib:masterfrom

tacaswell:fix_pandas_pcolor_regressiontacaswell/matplotlib:fix_pandas_pcolor_regressionCopy head branch name to clipboard