Merge changes from topic "bass-client-update" am: 30271869

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2139657



Change-Id: Iabaaaee0a0a5087041cde77002d2e27e6bd37138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>