[automerger skipped] leaudio/scanner: Add cap/bap filtering am: 9ed98f7a -s...

[automerger skipped] leaudio/scanner: Add cap/bap filtering am: 9ed98f7a -s ours am: 0aa69073 -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: I1eafc6890d1903897b55e9357ff9d43b3cf78a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>