Merge "Floss: Caches the discoverable mode" am: 2c9707c9 am: 2f089fea am:...

Merge "Floss: Caches the discoverable mode" am: 2c9707c9 am: 2f089fea am: b9ecf52f am: 3a99a1d2 am: 057de411 am: 1ecf2af0

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



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