Merge "Revert "Add TEST_MAPPING"" am: 10015aff66 am: 6584fb40fc

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

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