Merge "Fix getWifiManager exception if phone is encrypted" am: 1f45f29d18
am: 60d2beff2f

Change-Id: I1190931aad9e7c9356187b472e641d2b331edd76