[automerger skipped] BASS: Fix BASS client service to pass CTS tests am:...

[automerger skipped] BASS: Fix BASS client service to pass CTS tests am: 771724d4 am: 1d641070 am: 8e44a0cb -s ours

am skip reason: Merged-In Ie19cf24d2fe20948494643f3ce179d1a2c3a290f with SHA-1 9d0518ee is already in history

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



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