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