Merge "Remove from filter accept list upon cancel connect" am: c0ff7038 am: f4231e2a

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



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