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

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

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