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

Change-Id: Idd8522d0f7d2cf276f4872524e01a7232788063e