Merge "Stop WifiManagerTest from disabling current network." into gingerbread