Use "don't actively prefer" timeout when avoiding bad wifi

Bug: 281970908
Bug: 284253763
Test: ConnectivityServiceTest
(cherry picked from https://android-review.googlesource.com/q/commit:6f6c353baf746cc4cbb6d99d81941f2d70207d39)
Merged-In: I6e99aff77c55805630d878e472f466bd31bba360
Change-Id: I6e99aff77c55805630d878e472f466bd31bba360
2 files changed