Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365 am: 96f10677b9 am: 75f1728617 am: e2030a9129 am: b9af723682

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

Change-Id: Iebea54346fae9a35def17c3160e617834a63de7d