[automerger skipped] Merge "Add TEST_MAPPING" am: 6474cf9361 am: 875667f1d3 am: b54957cd2a -s ours

am skip reason: Merged-In Ie1fa80a5bdf9baa084dbfa4603414eb97afb15a6 with SHA-1 f29134c9c9 is already in history

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

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