[automerger skipped] Revert "BassClient: Fix issue that source could not be found" am: e01b1177 -s ours am: 9f844848 -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: Ia07ca29520bf767329d22f2e29a133b9e22d4377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>