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

Change-Id: I10a633ca1acdc331d435bb149529a81b62fa18f8