[automerger skipped] Merge "leaudio/scanner: Add cap/bap filtering" into...

[automerger skipped] Merge "leaudio/scanner: Add cap/bap filtering" into tm-qpr-dev am: 58f91667 -s ours am: 6075980d -s ours

am skip reason: Merged-In Ic90f0cec3f4e3e2a8a668405aed57dc0fe9a3f1f with SHA-1 40c44995 is already in history

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



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