[automerger skipped] Merge changes from topic "bass-client-update" into...

[automerger skipped] Merge changes from topic "bass-client-update" into tm-qpr-dev am: cfd746d5 -s ours am: 99b17af8 -s ours

am skip reason: Merged-In I94a3831bacd4c31d4489cc953dd7c06f382c8531 with SHA-1 234704bc is already in history

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



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