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

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

Change-Id: I21df41fdd4f0ace606317f9f473592b7fb6fe71c