Merge "[DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495" into stage-aosp-master