Merge "floss: Inquiry timeout stops all modes" am: d3297862 am: 6bcadf6e

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



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