Merge "Update the TEST_MAPPING files on AOSP (framework/base)" am: cceacfc1bb am: 166a26e89c

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

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