[automerger skipped] BassClient: Fix issue that source could not be found am: 5d10a01a am: 790c4a65 -s ours

am skip reason: Merged-In Id23db8e7bd9b2bdc42c688ffc0ae19551385c40b with SHA-1 21eec510 is already in history

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



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