DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: 53d83d5142 -s ours
am: a30ae5542b -s ours
Change-Id: If1fe794f87060443d721f0f269f519046a9ee321
This commit is contained in: