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

Change-Id: Iebd06f7c03b2068314c24a14a2b38d2413b88536