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

[automerger skipped] Merge "Extend scan timeout logic to downgrade regular scan" into tm-qpr-dev am: 45f0bd67 -s ours am: ad80d84c -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: Ibf512f2e5c8e564b06240235dac31c4dbf360b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>