Merge "Floss: Fix swapped on_scanner_registered signature" am: 61f9511c am:...

Merge "Floss: Fix swapped on_scanner_registered signature" am: 61f9511c am: ff348340 am: dd64241c am: 87085e01

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



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