Merge "Floss: filter unexpected cancel discovery from UI" am: ea4b7a08 am:...

Merge "Floss: filter unexpected cancel discovery from UI" am: ea4b7a08 am: 54709fa0 am: 2e82ec9f

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



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