Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e53 am: 96f10677 am: 75f17286

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

Change-Id: Ifd0974a0a61b67979b13ae399d235bd283d075fe