Merge "Fixed WifiManager checks to allow methods to be called by device owner." into sc-dev