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

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

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