Merge "floss: Scanner: Ensure the MSFT enable state correct" into main am: 9787dab2

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



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