Merge "Add TEST_MAPPING" am: 6474cf9361

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

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