Merge "WifiManager: return errors for WPS API calls"