[automerger skipped] [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9286329 am: 50a6190871 -s ours am: e60e2599b7 am: b2130bfa9d
am: 48bed434e4 -s ours
am skip reason: subject contains skip directive

Change-Id: I4e11092359c1fdf13a8a53cdc8f6f823505a5ceb