Merge "WifiManager.getCountryCode(): check NETWORK_SETTINGS permission instead" into rvc-dev