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 am: c333a8b9 am: f4b64efe

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



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