Merge "Extend scan timeout logic to downgrade regular scan" into...

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

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



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