Add TEST_MAPPING am: 9d6e818c6a am: 1d87380bd4

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

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