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

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



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