DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
am: 53d83d5142  -s ours

Change-Id: I07650e028dbe5be6d04761ae0cbb9e9512d31d53