Merge "floss: Don't bookmark connectable mode if set mode failed" into main...

Merge "floss: Don't bookmark connectable mode if set mode failed" into main am: fd997b34 am: 238d6f3b

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



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