diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index 4e84a7f..61f60d3 100644
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -22,11 +22,18 @@
         <boolean name="transmit_static_image" value="false" />
         <boolean name="show_video_quality_ui" value="false" />
         <boolean name="vowifi_call_quality" value="false" />
-        <boolean name="config_carrier_ims_call_deflect" value="false" />
+        <boolean name="carrier_allow_deflect_ims_call_bool" value="false" />
         <boolean name="carrier_rtt_supported" value="false" />
+        <boolean name="carrier_rtt_auto_upgrade" value="false" />
         <boolean name="carrier_rtt_supported_on_vtcalls" value="false" />
         <boolean name="carrier_rtt_upgrade_supported" value="false" />
         <boolean name="carrier_rtt_downgrade_supported" value="false" />
+        <string-array name="carrier_metered_iwlan_apn_types_strings" num="4">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+            <item value="fota" />
+        </string-array>
         <long name="carrier_data_call_apn_delay_default_long" value="10000" />
         <string-array name="carrier_metered_apn_types_strings" num="4">
             <item value="default" />
@@ -41,24 +48,192 @@
             <item value="fota" />
         </string-array>
         <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
         <boolean name="carrier_default_wfc_ims_enabled_bool" value="false" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-        <string-array name="roaming_operator_string_array" num="1">
-            <item value="23801" />
-        </string-array>
+        <boolean name="config_force_send_sms_over_cs" value="false" />
+        <boolean name="vendor_hide_volte_settng_ui" value="false" />
+        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
+        <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="false" />
+        <boolean name="vendor_disallow_data_roaming_settings" value="false" />
+        <boolean name="vendor_hide_call_forward_ui" value="false" />
+        <boolean name="emergency_sms_support_bool" value="false" />
     </carrier_config>
+    <carrier_config mcc="001" mnc="01">
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="202" mnc="01" />
+    <carrier_config mcc="202" mnc="02" />
+    <carrier_config mcc="204" mnc="02" />
     <carrier_config mcc="204" mnc="04">
         <boolean name="check_mobile_data_for_cf" value="true" />
     </carrier_config>
+    <carrier_config mcc="204" mnc="04" iccid="898603,898611,8985231,8985302,8985307">
+        <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="ascii_7_bit_support_for_long_message" value="true" />
+        <boolean name="cdma_cw_cf_enabled_bool" value="true" />
+        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+        <string-array name="apn_hide_rule_strings_array" num="2">
+            <item value="type" />
+            <item value="supl,mms" />
+        </string-array>
+        <map name="apn_default_values_strings_array">
+            <string name="protocol">IPV4V6</string>
+            <string name="roaming_protocol">IPV4V6</string>
+        </map>
+        <boolean name="config_show_orig_dial_string_for_cdma" value="true" />
+        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
+        <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="config_auto_retry_cfu_bool" value="true" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="208" mnc="01" />
+    <carrier_config mcc="208" mnc="09" />
+    <carrier_config mcc="208" mnc="11" />
+    <carrier_config mcc="208" mnc="13" />
+    <carrier_config mcc="208" mnc="20">
+        <string name="vendor_carrier_eons_short">Bouygues</string>
+        <boolean name="vendor_disallow_data_roaming_settings" value="true" />
+    </carrier_config>
+    <carrier_config mcc="208" mnc="21">
+        <string name="vendor_carrier_eons_short">Bouygues</string>
+        <boolean name="vendor_disallow_data_roaming_settings" value="true" />
+    </carrier_config>
+    <carrier_config mcc="208" mnc="88" />
+    <carrier_config mcc="214" mnc="01" />
+    <carrier_config mcc="214" mnc="03" />
+    <carrier_config mcc="214" mnc="06" />
+    <carrier_config mcc="214" mnc="09" />
+    <carrier_config mcc="214" mnc="11" />
+    <carrier_config mcc="219" mnc="01" />
     <carrier_config mcc="222" mnc="01">
         <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
     </carrier_config>
+    <carrier_config mcc="222" mnc="10" />
+    <carrier_config mcc="226" mnc="10" />
+    <carrier_config mcc="228" mnc="01" />
+    <carrier_config mcc="230" mnc="01" />
+    <carrier_config mcc="230" mnc="03" />
+    <carrier_config mcc="230" mnc="99" />
+    <carrier_config mcc="234" mnc="02" />
+    <carrier_config mcc="234" mnc="10">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_volte_entitlement_required_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="1" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
+        <string-array name="carrier_wifi_string_array" num="2">
+            <item value="V2lmaSBFeHRyYQ==,18" />
+            <item value="IFdpZmkgRXh0cmE=,18" />
+        </string-array>
+        <string name="carrier_name_string">O2 - UK</string>
+        <string name="vendor_carrier_eons_short">O2</string>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="11" />
+    <carrier_config mcc="234" mnc="15">
+        <string-array name="read_only_apn_types_string_array" num="0" />
+        <string-array name="carrier_wifi_string_array" num="1">
+            <item value="Vm9kYWZvbmVXaUZp,23" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="20" />
+    <carrier_config mcc="234" mnc="30">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string name="vendor_carrier_eons_short">EE</string>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="31">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string name="vendor_carrier_eons_short">EE</string>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="32">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string name="vendor_carrier_eons_short">EE</string>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="33">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string name="vendor_carrier_eons_short">EE</string>
+    </carrier_config>
+    <carrier_config mcc="234" mnc="30" gid1="2800000000000000">
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="false" />
+    </carrier_config>
+    <carrier_config mcc="234" mnc="34" />
+    <carrier_config mcc="235" mnc="01" />
+    <carrier_config mcc="235" mnc="02" />
+    <carrier_config mcc="235" mnc="91" />
+    <carrier_config mcc="235" mnc="94" />
+    <carrier_config mcc="238" mnc="01">
+        <string-array name="roaming_operator_string_array" num="1">
+            <item value="23801" />
+        </string-array>
+    </carrier_config>
+    <carrier_config mcc="238" mnc="02" />
+    <carrier_config mcc="238" mnc="06">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="238" mnc="10" />
+    <carrier_config mcc="240" mnc="02" />
+    <carrier_config mcc="240" mnc="10" />
+    <carrier_config mcc="242" mnc="01" />
+    <carrier_config mcc="242" mnc="05" />
+    <carrier_config mcc="242" mnc="12" />
+    <carrier_config mcc="244" mnc="05">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="244" mnc="06" />
+    <carrier_config mcc="244" mnc="21">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="250" mnc="02" />
+    <carrier_config mcc="260" mnc="02" />
+    <carrier_config mcc="260" mnc="03" />
+    <carrier_config mcc="260" mnc="05" />
+    <carrier_config mcc="260" mnc="34" />
+    <carrier_config mcc="262" mnc="01">
+        <boolean name="carrier_name_override_bool" value="false" />
+    </carrier_config>
+    <carrier_config mcc="262" mnc="02" />
+    <carrier_config mcc="262" mnc="03" />
+    <carrier_config mcc="262" mnc="05" />
+    <carrier_config mcc="262" mnc="06" />
+    <carrier_config mcc="262" mnc="07" />
+    <carrier_config mcc="262" mnc="08" />
+    <carrier_config mcc="262" mnc="11" />
+    <carrier_config mcc="268" mnc="01" />
+    <carrier_config mcc="286" mnc="02" />
     <carrier_config mcc="405" mnc="840">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -82,14 +257,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="854">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -113,14 +288,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="855">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -144,14 +319,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="856">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -175,14 +350,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="857">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -206,14 +381,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="858">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -237,14 +412,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
+        <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="859">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -268,14 +443,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="860">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -299,14 +474,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="861">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -330,14 +505,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="862">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -361,14 +536,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="863">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -392,14 +567,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="864">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -423,14 +598,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="865">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -454,14 +629,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="866">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -485,14 +660,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="867">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -516,14 +691,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="868">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -547,14 +722,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="869">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -578,14 +753,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="870">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -609,14 +784,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="871">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -640,14 +815,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="872">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -671,14 +846,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="873">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -702,14 +877,14 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
     <carrier_config mcc="405" mnc="874">
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
@@ -733,17 +908,21 @@
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_retry_sms_over_ims" value="true" />
+        <string name="vendor_carrier_eons_short">RJIO</string>
     </carrier_config>
+    <carrier_config mcc="440" mnc="10" />
+    <carrier_config mcc="440" mnc="20" />
     <carrier_config mcc="440" mnc="50">
-        <boolean name="config_carrier_ims_call_deflect" value="true" />
+        <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="440" mnc="51">
-        <boolean name="config_carrier_ims_call_deflect" value="true" />
+        <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="2" />
     </carrier_config>
     <carrier_config mcc="450" mnc="05">
         <boolean name="allow_video_call_in_low_battery" value="false" />
@@ -762,6 +941,8 @@
     </carrier_config>
     <carrier_config mcc="454" mnc="04">
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">Hutchison</string>
     </carrier_config>
     <carrier_config mcc="454" mnc="31" />
     <carrier_config mcc="455" mnc="02">
@@ -774,7 +955,12 @@
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
         </map>
-        <boolean name="carrier_volte_default_enabled_bool" value="false" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="false" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
     </carrier_config>
     <carrier_config mcc="455" mnc="07">
         <boolean name="check_mobile_data_for_cf" value="true" />
@@ -786,7 +972,12 @@
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
         </map>
-        <boolean name="carrier_volte_default_enabled_bool" value="false" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="false" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
     </carrier_config>
     <carrier_config mcc="460" mnc="00">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
@@ -826,7 +1017,12 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Mobile</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="01">
         <boolean name="config_spn_override_enabled" value="true" />
@@ -840,6 +1036,9 @@
             <string name="roaming_protocol">IPV4V6</string>
         </map>
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Unicom</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="02">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
@@ -879,7 +1078,12 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Mobile</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="03">
         <boolean name="check_mobile_data_for_cf" value="true" />
@@ -896,7 +1100,17 @@
         </map>
         <boolean name="config_show_orig_dial_string_for_cdma" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="false" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="false" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Telecom</string>
+        <boolean name="config_auto_retry_cfu_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="04">
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -913,7 +1127,11 @@
             <string name="roaming_protocol">IPV4V6</string>
         </map>
         <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="false" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="false" />
+        <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Telecom</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="06">
         <boolean name="config_spn_override_enabled" value="true" />
@@ -923,6 +1141,9 @@
             <string name="roaming_protocol">IPV4V6</string>
         </map>
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Unicom</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="07">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
@@ -962,7 +1183,12 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">China Mobile</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="08">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
@@ -1001,7 +1227,10 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="09">
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1010,6 +1239,8 @@
             <string name="roaming_protocol">IPV4V6</string>
         </map>
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <string name="carrier_name_string">China Unicom</string>
     </carrier_config>
     <carrier_config mcc="460" mnc="10">
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1034,7 +1265,15 @@
             <string name="roaming_protocol">IPV4V6</string>
         </map>
         <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="false" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="false" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <boolean name="config_auto_retry_cfu_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="12">
         <boolean name="check_mobile_data_for_cf" value="true" />
@@ -1051,206 +1290,387 @@
             <string name="roaming_protocol">IPV4V6</string>
         </map>
         <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="false" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="false" />
+        <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="config_auto_retry_cfu_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="00">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="030">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="070">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="080">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="090">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="030">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="150">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="170">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="280">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="380">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="410">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="560">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="680">
         <boolean name="config_enable_display_14digit_imei" value="false" />
         <boolean name="transmit_static_image" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="980">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="310" mnc="260">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
         <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
         <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="160">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="200">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="210">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
         <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
         <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="220">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="230">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="240">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="250">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="270">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="300">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="310">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
         <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
         <boolean name="carrier_rtt_upgrade_supported" value="true" />
-        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="490">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="530">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="580">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="590">
+        <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="true" />
+        <string name="vendor_carrier_eons_short">Verizon</string>
+        <int name="maxSubjectLength" value="80" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <boolean name="call_barring_visibility_bool" value="false" />
+        <boolean name="vendor_hide_call_forward_ui" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="640">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="660">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="800">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="311" mnc="180">
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_name_override_bool" value="false" />
         <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
         <boolean name="carrier_rtt_upgrade_supported" value="true" />
         <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
+    </carrier_config>
+    <carrier_config mcc="311" mnc="00">
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="311" mnc="180">
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="311" mnc="480">
         <boolean name="support_video_conference_call_bool" value="false" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="false" />
-        <boolean name="carrier_rtt_upgrade_supported" value="false" />
+        <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="support_downgrade_vt_to_audio_bool" value="true" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
+        <boolean name="emergency_sms_support_bool" value="true" />
+        <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="true" />
+        <string name="vendor_carrier_eons_short">Verizon</string>
+        <int name="maxSubjectLength" value="80" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <boolean name="call_barring_visibility_bool" value="false" />
+        <boolean name="vendor_hide_call_forward_ui" value="true" />
     </carrier_config>
+    <carrier_config mcc="312" mnc="530" />
+    <carrier_config mcc="310" mnc="120" />
     <carrier_config>
         <string-array name="ratchet_rat_families" num="3">
             <item value="1,2" />
@@ -1258,68 +1678,77 @@
             <item value="3,11,9,10,15" />
         </string-array>
     </carrier_config>
-    <carrier_config mcc="234" mnc="10">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="carrier_volte_entitlement_required_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="1" />
-        <string-array name="carrier_wifi_string_array" num="2">
-            <item value="V2lmaSBFeHRyYQ==,18" />
-            <item value="IFdpZmkgRXh0cmE=,18" />
-        </string-array>
-    </carrier_config>
     <carrier_config mcc="454" mnc="12">
         <boolean name="allow_use_ims_for_ecc_bool" value="false" />
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="454" mnc="13">
         <boolean name="allow_use_ims_for_ecc_bool" value="false" />
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="466" mnc="97">
         <boolean name="allow_use_ims_for_ecc_bool" value="false" />
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">Taiwan Mobile</string>
     </carrier_config>
     <carrier_config mcc="466" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">FarEasTone</string>
     </carrier_config>
     <carrier_config mcc="466" mnc="92">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">Chunghwa Telecom</string>
+    </carrier_config>
+    <carrier_config mcc="466" mnc="89">
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">T Star</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="26">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="310" mnc="31">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_rtt_supported" value="true" />
+        <boolean name="carrier_rtt_auto_upgrade" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_upgrade_supported" value="true" />
+        <boolean name="carrier_rtt_downgrade_supported" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
+        <string name="vendor_carrier_eons_short">TMO</string>
+        <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
+        <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
     </carrier_config>
     <carrier_config mcc="502" mnc="152">
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
+        <boolean name="enhanced_4g_lte_on_by_default_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="234" mnc="30">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="234" mnc="31">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="234" mnc="32">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="234" mnc="33">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="310" mnc="30" />
-    <carrier_config mcc="310" mnc="70" />
-    <carrier_config mcc="310" mnc="90" />
     <carrier_config mcc="001" mnc="001" />
     <carrier_config mcc="001" mnc="001" spn="null">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1330,22 +1759,6 @@
     <carrier_config mcc="001" mnc="001" imsi="^001001.*">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="001" mnc="010" />
-    <carrier_config mcc="001" mnc="01" />
-    <carrier_config mcc="214" mnc="01" />
-    <carrier_config mcc="222" mnc="10" />
-    <carrier_config mcc="262" mnc="02" />
-    <carrier_config mcc="268" mnc="01" />
-    <carrier_config mcc="230" mnc="01" />
-    <carrier_config mcc="310" mnc="028" />
-    <carrier_config mcc="450" mnc="00" />
-    <carrier_config mcc="440" mnc="10" />
-    <carrier_config mcc="311" mnc="390" />
-    <carrier_config mcc="440" mnc="00" />
-    <carrier_config mcc="441" mnc="00" />
-    <carrier_config mcc="441" mnc="20" />
-    <carrier_config mcc="450" mnc="02" />
-    <carrier_config mcc="440" mnc="20" />
     <carrier_config mcc="404" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
@@ -1415,90 +1828,97 @@
     <carrier_config mcc="405" mnc="56">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="244" mnc="05">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="244" mnc="21">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_volte_default_enabled_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="238" mnc="06">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
     <carrier_config mcc="404" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="05">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="13">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="15">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="20">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="27">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="43">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="46">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="60">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="84">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="86">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="88">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="30">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="66">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="67">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="750">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="751">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="752">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="753">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="754">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="755">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="405" mnc="756">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_force_send_sms_over_cs" value="true" />
     </carrier_config>
     <carrier_config mcc="404" mnc="04">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1581,4 +2001,31 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
     </carrier_config>
+    <carrier_config mcc="310" mnc="890">
+        <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="true" />
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string name="vendor_carrier_eons_short">Verizon</string>
+        <int name="maxSubjectLength" value="80" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <boolean name="call_barring_visibility_bool" value="false" />
+        <boolean name="vendor_hide_call_forward_ui" value="true" />
+    </carrier_config>
+    <carrier_config mcc="311" mnc="270">
+        <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="true" />
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string name="vendor_carrier_eons_short">Verizon</string>
+        <int name="maxSubjectLength" value="80" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <boolean name="call_barring_visibility_bool" value="false" />
+        <boolean name="vendor_hide_call_forward_ui" value="true" />
+    </carrier_config>
+    <carrier_config mcc="312" mnc="770">
+        <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="true" />
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string name="vendor_carrier_eons_short">Verizon</string>
+        <int name="maxSubjectLength" value="80" />
+        <boolean name="vendor_hide_volte_settng_ui" value="true" />
+        <boolean name="call_barring_visibility_bool" value="false" />
+        <boolean name="vendor_hide_call_forward_ui" value="true" />
+    </carrier_config>
 </carrier_config_list>
\ No newline at end of file