am e85d6ee8: am f338acb4: Merge "Stop WifiManagerTest from disabling current network." into gingerbread

* commit 'e85d6ee8ad21e7ca147b6553f059af752c05d74a':
  Stop WifiManagerTest from disabling current network.