Merge "Add TEST_MAPPING" am: 6474cf9361 am: 875667f1d3

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

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