[automerger skipped] Merge "[DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495" into stage-aosp-master am: 0a7dd8e87a -s ours
am: f45395d6e0

Change-Id: I16648dd6a9cb2d9d16d655fe0676e8fb90338ded