[automerger skipped] Merge "[conflict] BassClient: Fix issue that source could...

[automerger skipped] Merge "[conflict] BassClient: Fix issue that source could not be found am: 5d10a01a am: 03566c80" into tm-qpr-dev am: c0c5477b -s ours am: 086189ac -s ours

am skip reason: Merged-In Id23db8e7bd9b2bdc42c688ffc0ae19551385c40b with SHA-1 5d10a01a is already in history

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



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