Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c

am: 01741762d8

Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
index 7ada1f4,b9c0e1c..75ef70b
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@@ -1743,10 -1740,10 +1760,12 @@@ public class CarrierConfigManager 
          sDefaults.putInt(KEY_LTE_EARFCNS_RSRP_BOOST_INT, 0);
          sDefaults.putStringArray(KEY_BOOSTED_LTE_EARFCNS_STRING_ARRAY, null);
          sDefaults.putBoolean(KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL, false);
 +        sDefaults.putInt(IMSI_KEY_EXPIRATION_DAYS_TIME_INT, IMSI_ENCRYPTION_DAYS_TIME_DISABLED);
 +        sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
        sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);
          sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
+         sDefaults.putInt(IMSI_KEY_EXPIRATION_DAYS_TIME_INT, IMSI_ENCRYPTION_DAYS_TIME_DISABLED);
+         sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
      }
  
      /**