Merge "Extend scan timeout logic to downgrade regular scan" into tm-dev-plus-aosp am: 58dea7f8

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



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