diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index 74d4bb7b..2a0ec617 100644
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -1266,417 +1266,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="config_update_service_status" value="false"/>
     </carrier_config>
 
-    <carrier_config mcc="460" mnc="00">
+    <carrier_config mcc="460">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" 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" />
-        <string name="carrier_name_string">China Mobile</string>
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="support_video_conference_call_bool" value="false"/>
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="01">
-        <boolean name="notify_video_call_failed" value="true" />
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_spn_override_enabled" 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,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <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>
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="config_update_volte_icon" value="false"/>
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" 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" />
-        <string name="carrier_name_string">China Mobile</string>
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="support_video_conference_call_bool" value="false"/>
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="03">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <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" />
-        <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" />
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="config_common_callsettings_support_bool" value="true" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="disable_filter_out_conference_host" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="04">
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="05">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="disable_filter_out_conference_host" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="06">
-        <boolean name="notify_video_call_failed" value="true" />
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <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>
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="config_update_volte_icon" value="false"/>
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="07">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" 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="config_update_service_status" value="false"/>
-        <boolean name="support_video_conference_call_bool" value="false"/>
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="08">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" 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="config_update_service_status" value="false"/>
-        <boolean name="support_video_conference_call_bool" value="false"/>
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="09">
-        <boolean name="notify_video_call_failed" value="true" />
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <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>
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="config_update_volte_icon" value="false"/>
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_holding_video_call" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="10">
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="11">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <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"/>
-        <boolean name="config_show_orig_dial_string_for_cdma" 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="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <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" />
-        <boolean name="config_update_service_status" value="false"/>
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="config_common_callsettings_support_bool" value="true" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="disable_filter_out_conference_host" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="12">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <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"/>
-        <boolean name="config_show_orig_dial_string_for_cdma" 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="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-        <boolean name="config_auto_retry_cfu_bool" value="true" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="config_common_callsettings_support_bool" value="true" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
     </carrier_config>
 
     <carrier_config mcc="310" mnc="00">