Merge "Fix audio/aidl/TEST_MAPPING" into main am: 7ebd917745 am: 91eee5abb0 am: 6ed52f113e

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

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