[automerger skipped] BassClient: Fix issue that source could not be found am:...

[automerger skipped] BassClient: Fix issue that source could not be found am: 5311e8dd am: 8f92c8de -s ours am: d2c7541d -s ours am: 4bb156ae -s ours

am skip reason: Merged-In Ib5435169f5796e1df180a780dd295398f016f258 with SHA-1 5311e8dd is already in history

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



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