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

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

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