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 am: 1c487421

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



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