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

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

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



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