Merge "ConnectivityServiceTest: fix testAvoidBadWifiSettings"