Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev

am: 130db7715a

Change-Id: I3385fe2660bf9da3f13ef90f4b4b17a8ad0b64ad

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
index af15c0a,ff7ca62..44d89c1
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@@ -897,12 -854,11 +915,13 @@@ public class CarrierConfigManager 
          sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");
          sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);
          sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);
+         sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);
  
 -        // Used for Sim card State detection app
 -        sDefaults.putStringArray(KEY_SIM_PROVISIONING_STATUS_DETECTION_CARRIER_APP_STRING_ARRAY,
 -                null);
 +        // Carrier Signalling Receivers
 +        sDefaults.putStringArray(KEY_SIGNAL_REDIRECTION_RECEIVER_STRING_ARRAY, null);
 +        sDefaults.putStringArray(KEY_SIGNAL_DCFAILURE_RECEIVER_STRING_ARRAY, null);
 +        sDefaults.putStringArray(KEY_SIGNAL_PCO_RECEIVER_STRING_ARRAY, null);
 +        sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, "");
      }
  
      /**