[automerger skipped] Merge "Remove from filter accept list upon cancel...

[automerger skipped] Merge "Remove from filter accept list upon cancel connect" into tm-dev am: 9ac4a9f1 -s ours am: 51534409 -s ours am: 4a0bcf3c -s ours

am skip reason: Merged-In I2d0d2d64c621d565d1ed985da4b061563029def1 with SHA-1 a5e9eeab is already in history

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



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