[automerger skipped] Merge "Add TEST_MAPPING to schedule auto test" am:...
[automerger skipped] Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92 am: 374153a5 am: d4a5fc58 -s ours
am skip reason: Change-Id I0847d1dea352d0e3b87b1bb95d5c2600a80a7438 with SHA-1 80d9fcbf is in history
Change-Id: I51eb0db82ff5e0f55e9d3f09c79e0f5aaaef42bc