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

[automerger skipped] Merge "Remove from filter accept list upon cancel connect" into tm-d1-dev am: 03950924 am: 219535f4 -s ours am: e9ac1de7 -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/+/19399009



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