[automerger skipped] Merge "Use empty filter for CSIS discovery" into...

[automerger skipped] Merge "Use empty filter for CSIS discovery" into tm-qpr-dev am: 3e7b561e -s ours

am skip reason: Merged-In If184faaf987bd2b86e9760e4cd2f655423191199 with SHA-1 9583404f is already in history

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



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