Merge "Add presubmit TEST_MAPPING" am: 3ba9654196 am: 1c9f91c672 am: c59d9a69ab

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

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