Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365 am: 96f10677b9

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

Change-Id: I090a3dde6ec5cb15db575602a5659b4732c2b53b