Merge "Fix audio/aidl/TEST_MAPPING" into main am: 7ebd9177 am: 91eee5ab...

Merge "Fix audio/aidl/TEST_MAPPING" into main am: 7ebd9177 am: 91eee5ab am: 6ed52f11 am: 506ba519 am: 9fb65f53

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



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