[automerger skipped] [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495 am: 1a5bb835 -s ours am: 4a6be8e9 Change-Id: I1161f62999194f2c006a1da9ca3388109d703612