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

[automerger skipped] Extend scan timeout logic to downgrade regular scan am: 73fa13ec -s ours am: 0be343c8 -s ours am: 5c61e256 -s ours am: 0fe7bd87 -s ours

am skip reason: Merged-In I5a8faaa3f12661750ee580b20a58a07ec11b4efc with SHA-1 6ef5ea6b is already in history

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



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