[automerger skipped] [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495 am: 1a5bb83588 -s ours am: 4a6be8e994
am: 7c2d7564cf

Change-Id: Ib50b7d55b238238b18bf07711d9a98e6f3f6d8b9