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

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

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