[automerger skipped] [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9286329 am: 50a6190871 -s ours am: e60e2599b7
am: b2130bfa9d

Change-Id: Ic3e9855e6a9cfc5de78d61ff2b9e359d2dd6caf1