Cherry pick: Mcc should not set country code with persistent request

A false persistent parameter ensures that wifi country code
will fall back to phone default country code upon SIM card removing.

Bug:31640617
Change-Id: I38c522aa22162c900109e12a5925d4d87d4d51f9
Test: compile

parent 7c08118a

src/java/com/android/internal/telephony/MccTable.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -380,8 +380,7 @@ public final class MccTable {
		String country = MccTable.countryCodeForMcc(mcc);
		Slog.d(LOG_TAG, "WIFI_COUNTRY_CODE set to " + country);
		WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		//persist
		wM.setCountryCode(country, true);
		wM.setCountryCode(country, false);
		}

		static {