am 7a224b0f: am d07223f8: Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev

* commit '7a224b0f339c62f34fd2b1e20be225bd7ff8deb8':
  Fix getConfiguredNetworks when wifi is disabled