[automerger skipped] Merge "Add TEST_MAPPING" am: 6474cf93 am: 875667f1...

[automerger skipped] Merge "Add TEST_MAPPING" am: 6474cf93 am: 875667f1 am: b54957cd -s ours am: 5a4d26b0 -s ours

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

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



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