DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: 53d83d5142  -s ours am: a30ae5542b  -s ours am: 05236e77fe
am: 3e3ece174f  -s ours

Change-Id: I13b634eaa559a2296c102d60c11e817b0af4ee5a