[automerger skipped] Extend scan timeout logic to downgrade regular scan am: b79d65fc -s ours

am skip reason: Merged-In I5a8faaa3f12661750ee580b20a58a07ec11b4efc with SHA-1 73fa13ec is already in history

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



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