Merge "Remove persist option for WifiManager.setCountryCode()"