Merge "Fix audio/aidl/TEST_MAPPING" into main