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

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

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



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