Merge "Add TEST_MAPPING config" am: 73cb8af65e am: 077ad38a59 am: 0325dd3120

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2274937

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