Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev