[automerger skipped] [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495
am: 1a5bb83588 -s ours
am skip reason: subject contains skip directive

Change-Id: I885b929991b48f648c4654c6d2df8fb5f9eafdf7