Merge "Revert "Add TEST_MAPPING"" am: 10015aff66 am: 6584fb40fc am: 6a37a5c5e5 am: a55c51a8e1

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

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