Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d

Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
index 22e2882,5c2e0ba..851d643
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@@ -593,14 -582,20 +593,27 @@@ public class CarrierConfigManager 
      public static final String KEY_WFC_DATA_SPN_FORMAT_IDX_INT = "wfc_data_spn_format_idx_int";
  
      /**
 -
 +     * The Component Name of the activity that can setup the emergency addrees for WiFi Calling
 +     * as per carrier requirement.
 +     * @hide
 +     */
 +     public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING =
 +            "wfc_emergency_address_carrier_app_string";
 +
 +    /**
+      * Boolean to decide whether to use #KEY_CARRIER_NAME_STRING from CarrierConfig app.
+      * @hide
+      */
+     public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";
+ 
+     /**
+      * String to identify carrier name in CarrierConfig app. This string is used only if
+      * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true
+      * @hide
+      */
+     public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";
+ 
+     /**
       * If this is true, the SIM card (through Customer Service Profile EF file) will be able to
       * prevent manual operator selection. If false, this SIM setting will be ignored and manual
       * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more
@@@ -811,8 -798,9 +824,10 @@@
          sDefaults.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null);
          sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0);
          sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0);
 +        sDefaults.putString(KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING, "");
          sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
+         sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
+         sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
  
          // MMS defaults
          sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);