[automerger skipped] Merge "Add presubmit TEST_MAPPING" am: 3ba96541 am:...

[automerger skipped] Merge "Add presubmit TEST_MAPPING" am: 3ba96541 am: 1c9f91c6 am: c59d9a69 am: 0ffc5dcb am: d78cc1db -s ours

am skip reason: Merged-In Ibd84045b26efe2b46a33da9c220834e0f7c33fd8 with SHA-1 1f635608 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2488435



Change-Id: Id9591b25ddf907823ff7c7bbc7b4e052c7d69a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>