[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: 71f43a10 -s ours am: ceb6b9b1 -s ours

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

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



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