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

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



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