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

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

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

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



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