[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 am: 376730d7 -s ours am: 2ea8e9a1 -s ours

am skip reason: skipped by user siyuanh

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



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