Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f92 am: c696aca6 Change-Id: I0fa23ad694ab71f361b4de30cf3bbac688fd1d0e