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

[automerger skipped] Merge "Extend scan timeout logic to downgrade regular scan" into stage-aosp-master am: 71a5d83e -s ours am: 3603178f -s ours am: e36ecf61 -s ours am: 102f87b7 -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: I95686d5a6742f827b572832222c879ffdf266d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>