Merge changes from topic "fix-bass-client-cts-229790402" am: 990dafe1 am: 03f6f55f

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



Change-Id: Ifc43744e53d4745cb1d7d985a3d57a575e61b66a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>