Merge "Set correct ScanFilter for bass assistant" am: 38a6a262 am: cf84ca46 am: b18abe29 am: 119a9e34

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



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