[automerger skipped] Merge "Extend scan timeout logic to downgrade regular...

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