Merge "Set mGotCountryCode properly."

Author: Wink Saville

telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

@@ -390,6 +390,7 @@ protected void pollStateDone() {
 
             if (operatorNumeric == null) {
                 phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
+                mGotCountryCode = false;
             } else {
                 String isoCountryCode = "";
                 try {

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

@@ -964,6 +964,7 @@ protected void pollStateDone() {
 
             if (operatorNumeric == null) {
                 phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
+                mGotCountryCode = false;
             } else {
                 String isoCountryCode = "";
                 try{

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

@@ -846,6 +846,7 @@ private void pollStateDone() {
 
             if (operatorNumeric == null) {
                 phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
+                mGotCountryCode = false;
             } else {
                 String iso = "";
                 try{