[conflict] BassClient: Fix issue that source could not be found am: 5d10a01a am: 03566c80

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



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