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

Change-Id: I47d47742083f38367fec31850db9d0e7fc9b3c13