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

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

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



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