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

[automerger skipped] Merge "Revert "BassClient: Fix issue that source could not be found"" into tm-dev am: 63de86ff -s ours

am skip reason: Merged-In I74b91daf8944da1547049817ae2e9c353bbcc3f2 with SHA-1 f122d1a0 is already in history

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



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