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

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

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