[automerger skipped] Merge "Add new aidl interface for android.hardware.bluetooth.audio" am: e0a7d60db0 am: 8f191590a5 am: 81bef7285c am: a5becfbd2c -s ours

am skip reason: Merged-In Ida6d664b2c3eedfb4c3abaece7c3540623c72270 with SHA-1 0fbd060e51 is already in history

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

Change-Id: I67d7fb9ff5402625a727ea0cb8287d552bdb771d