Merge "Add TEST_MAPPING files." am: f9e6c5104d am: 57d837ac95 am: 2256af5448

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2321462

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