[conflict] Merge "Revert "BassClient: Fix issue that source could not be...

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

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



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