Merge "Use "don't actively prefer" timeout when avoiding bad wifi" am: 7be7f06fc4 am: 2888d86635 am: adf2ce7657

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588507

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