[automerger skipped] Extend scan timeout logic to downgrade regular scan am:...

[automerger skipped] Extend scan timeout logic to downgrade regular scan am: b79d65fc -s ours am: e3224641 -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: I7c886858fd20688f93741b1cca49e430f8007da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>