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

Change-Id: I057db518cec7f9646b782a86dc6df7d4b81ec9ec