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

Change-Id: Id0dbd406f16e72840f0294557d34f439466cd942