Merge "Floss: Disallow retring non-basic mode" am: cd467bb6 am: cad2bc18 am: 539596a3

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



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