diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index b3c221d..42ffbec 100644
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -1,18 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2020 The LineageOS Project
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<!--Copyright (c) 2016, 2019 The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <carrier_config_list>
+    <!-- Below are some sample filters for various scenarios.
+         You can have multiple carrier_config blocks.
+         blocks for various filters. For more info visit DefaultCarrierConfigService.java
+
+        <carrier_config mcc="1234">
+        //Configs applicable for mcc=1234 and any mnc
+        </carrier_config>
+
+        <carrier_config mcc="1234" mnc="678">
+        //Configs applicable for mcc=1234 and mnc=678
+        </carrier_config>
+
+        <carrier_config device="msm8996">
+        //Configs applicable for msms8996.
+        </carrier_config>-->
+
     <carrier_config>
         <boolean name="apn_expand_bool" value="true" />
         <boolean name="world_phone_bool" value="true" />
@@ -21,48 +51,76 @@
         <boolean name="show_cdma_choices_bool" value="true" />
         <boolean name="allow_video_call_in_low_battery" value="true" />
         <boolean name="config_enable_display_14digit_imei" value="false" />
+        <!-- Determines whether UI extensions for video calls should be used or not -->
         <boolean name="video_call_use_ext" value="true" />
+        <!-- Determines if a customized video ui support is required or not -->
         <boolean name="use_custom_video_ui" value="false" />
         <boolean name="config_hide_preview_in_vt_confcall" value="false" />
         <boolean name="config_carrier_cs_retry_available" value="false" />
+        <!-- Controls modify call capabilities
+             FALSE - default capabilities will be retained
+             TRUE - remove modify call capabilities which will hide modify call button -->
         <boolean name="remove_modify_call_capability" value="false" />
-        <boolean name="show_video_quality_toast" value="true" />
-        <boolean name="show_call_session_event_toast" value="true" />
-        <boolean name="show_data_usage_toast" value="true" />
+        <!-- Config to show/hide Video quality toast -->
+        <boolean name="show_video_quality_toast" value="true"/>
+        <!-- Config to show/hide call session event toast like player start/stop -->
+        <boolean name="show_call_session_event_toast" value="true"/>
+        <!-- Config to show/hide data usage toast -->
+        <boolean name="show_data_usage_toast" value="true"/>
         <boolean name="show_apn_setting_cdma_bool" value="true" />
-        <boolean name="support_video_conference_call_bool" value="true" />
-        <boolean name="show_static_image_ui" value="false" />
-        <boolean name="transmit_static_image" value="false" />
+        <!-- Config to enable video conference call support -->
+        <boolean name="support_video_conference_call_bool" value="true"/>
+        <!-- Config that controls whether to show static image related UI elements or not
+             eg. static image option under IMS Settings, static image in preview window,
+             hide me button in active call screen etc. -->
+        <boolean name="show_static_image_ui" value="false"/>
+        <!-- Config that controls whether to stop video preview video and show static image
+             in video preview or not -->
+        <boolean name="transmit_static_image" value="false"/>
         <boolean name="show_video_quality_ui" value="false" />
+        <!-- Config to control the voWiFi call quality indication. -->
         <boolean name="vowifi_call_quality" value="false" />
         <boolean name="carrier_allow_deflect_ims_call_bool" value="false" />
+
+        <!-- Config for RTT feature support -->
         <boolean name="rtt_auto_upgrade_bool" value="false" />
-        <boolean name="rtt_supported_for_vt_bool" value="false" />
-        <boolean name="rtt_upgrade_supported_bool" value="false" />
-        <boolean name="rtt_downgrade_supported_bool" value="false" />
+        <boolean name="rtt_supported_for_vt_bool" value="false"/>
+        <boolean name="rtt_upgrade_supported_bool" value="false"/>
+        <boolean name="rtt_downgrade_supported_bool" value="false"/>
         <boolean name="show_rtt_visibility_setting_bool" value="false" />
         <boolean name="ignore_rtt_mode_setting_bool" value="false" />
         <int name="default_rtt_mode_int" value="0" />
-        <boolean name="config_update_service_status" value="false" />
-        <boolean name="config_update_volte_icon" value="false" />
+
+        <!-- HD/VOLTE icon support -->
+        <boolean name="config_update_service_status" value="false"/>
+        <boolean name="config_update_volte_icon" value="false"/>
+
         <boolean name="auto_retry_failed_wifi_emergency_call" value="true" />
+
+        <!-- Enable SS over UT by default-->
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="allow_hold_video_call_bool" value="true" />
-        <boolean name="allow_one_way_accept_video_call" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="false" />
-        <boolean name="carrier_call_composer_supported_bool" value="false" />
+
+        <!-- Config to allow hold in video calls -->
+        <boolean name="allow_hold_video_call_bool" value="true"/>
+        <!-- Config to allow accept one way for video calls -->
+        <boolean name="allow_one_way_accept_video_call" value="true"/>
+        <!-- Config for multi anchor conference support  -->
+        <boolean name="carrier_supports_multianchor_conference" value="false"/>
+        <!-- Config for Call Composer Feature support  -->
+        <boolean name="carrier_call_composer_supported_bool" value="false"/>
+        <!-- Config for explicit call transfer support for an IMS call -->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="1" mnc="1">
+
+    <carrier_config mcc="001" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-        <string name="5g_icon_configuration_string">connected_mmwave:5GUWB,connected:5g,not_restricted:None,restricted:None
-        </string>
+        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="202" mnc="1">
+
+    <carrier_config mcc="202" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
@@ -70,45 +128,47 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="202" mnc="2">
+
+    <carrier_config mcc="202" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="204" mnc="2">
+
+    <carrier_config mcc="204" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="204" mnc="4">
+
+    <carrier_config mcc="204" mnc="04">
         <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" />
     </carrier_config>
-    <carrier_config iccid="898603,898611,8985231,8985302,8985307" mcc="204" mnc="4">
+
+    <carrier_config mcc="204" mnc="04" iccid="898603,898611,8985231,8985302,8985307">
         <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="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" />
+            <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>
+            <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="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" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
         <boolean name="config_enable_video_crbt" value="true" />
+        <boolean name="config_disable_clir_over_ut" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <string-array name="carrier_metered_apn_types_strings" num="3">
             <item value="default" />
@@ -116,6 +176,7 @@
             <item value="supl" />
         </string-array>
     </carrier_config>
+
     <carrier_config mcc="204" mnc="16">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -124,6 +185,7 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
+
     <carrier_config mcc="204" mnc="20">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -132,49 +194,62 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="208" mnc="1">
+
+    <carrier_config mcc="208" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="208" mnc="9">
+
+    <carrier_config mcc="208" mnc="09">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="208" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="208" mnc="13">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="208" mnc="20">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="208" mnc="21">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="208" mnc="88">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="214" mnc="1">
+
+    <carrier_config mcc="214" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="214" mnc="3">
+
+    <carrier_config mcc="214" mnc="03">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="214" mnc="6">
+
+    <carrier_config mcc="214" mnc="06">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="214" mnc="9">
+
+    <carrier_config mcc="214" mnc="09">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="214" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="216" mnc="30">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -183,49 +258,58 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="219" mnc="1">
+
+    <carrier_config mcc="219" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="222" mnc="1">
+
+    <carrier_config mcc="222" mnc="01">
         <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="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
     </carrier_config>
+
     <carrier_config mcc="222" mnc="10">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="226" mnc="10">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="228" mnc="1">
+
+    <carrier_config mcc="228" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="230" mnc="1">
+
+    <carrier_config mcc="230" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="230" mnc="3">
+
+    <carrier_config mcc="230" 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" />
     </carrier_config>
+
     <carrier_config mcc="230" mnc="99">
         <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" />
     </carrier_config>
-    <carrier_config mcc="232" mnc="3">
+
+    <carrier_config mcc="232" mnc="03">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
@@ -233,7 +317,8 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="232" mnc="7">
+
+    <carrier_config mcc="232" mnc="07">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
@@ -241,7 +326,8 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="233" mnc="2">
+
+    <carrier_config mcc="233" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
@@ -249,7 +335,8 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="233" mnc="4">
+
+    <carrier_config mcc="233" mnc="04">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
@@ -257,77 +344,96 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="234" mnc="2">
+
+    <carrier_config mcc="234" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </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" />
     </carrier_config>
+
     <carrier_config mcc="234" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="234" mnc="15">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="234" mnc="20">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_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="234" mnc="34">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="235" mnc="1">
+
+    <carrier_config mcc="235" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="235" mnc="2">
+
+    <carrier_config mcc="235" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="235" mnc="91">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="235" mnc="94">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="238" mnc="1">
+
+    <carrier_config mcc="238" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="238" mnc="2">
+
+    <carrier_config mcc="238" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="238" mnc="6">
+
+    <carrier_config mcc="238" mnc="06">
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="238" mnc="10">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="238" mnc="20">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -335,6 +441,7 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
+
     <carrier_config mcc="238" mnc="30">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -342,53 +449,64 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="240" mnc="1">
+
+    <carrier_config mcc="240" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_mode_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="240" mnc="2">
+
+    <carrier_config mcc="240" mnc="02">
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="240" mnc="10">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="242" mnc="1">
+
+    <carrier_config mcc="242" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="242" mnc="2">
+
+    <carrier_config mcc="242" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_mode_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="242" mnc="5">
+
+    <carrier_config mcc="242" mnc="05">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_mode_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
+
     <carrier_config mcc="242" mnc="12">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="244" mnc="5">
+
+    <carrier_config mcc="244" mnc="05">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="244" mnc="6">
+
+    <carrier_config mcc="244" mnc="06">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="244" mnc="21">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="244" mnc="91">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -396,10 +514,12 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="246" mnc="1">
+
+    <carrier_config mcc="246" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="248" mnc="1">
+
+    <carrier_config mcc="248" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -407,74 +527,90 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="250" mnc="2">
+
+    <carrier_config mcc="250" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="260" mnc="2">
+
+    <carrier_config mcc="260" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="260" mnc="3">
+
+    <carrier_config mcc="260" mnc="03">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="260" mnc="5">
+
+    <carrier_config mcc="260" mnc="05">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="260" mnc="34">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="1">
+
+    <carrier_config mcc="262" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="2">
+
+    <carrier_config mcc="262" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="3">
+
+    <carrier_config mcc="262" 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" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="5">
+
+    <carrier_config mcc="262" 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" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="6">
+
+    <carrier_config mcc="262" mnc="06">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="7">
+
+    <carrier_config mcc="262" 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" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="8">
+
+    <carrier_config mcc="262" 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" />
     </carrier_config>
+
     <carrier_config mcc="262" 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" />
     </carrier_config>
-    <carrier_config mcc="268" mnc="1">
+
+    <carrier_config mcc="268" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="286" mnc="2">
+
+    <carrier_config mcc="286" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="405" mnc="840">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -483,28 +619,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="854">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -513,28 +650,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="855">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -543,28 +681,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="856">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -573,28 +712,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="857">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -603,28 +743,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="858">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -633,28 +774,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="859">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -663,28 +805,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="860">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -693,28 +836,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="861">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -723,28 +867,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="862">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -753,28 +898,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="863">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -783,28 +929,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="864">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -813,28 +960,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="865">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -843,28 +991,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="866">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -873,28 +1022,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="867">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -903,28 +1053,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="868">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -933,28 +1084,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="869">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -963,28 +1115,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="870">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -993,28 +1146,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="871">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -1023,28 +1177,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="872">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -1053,28 +1208,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="873">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -1083,28 +1239,29 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="405" mnc="874">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -1113,137 +1270,149 @@
         <boolean name="video_call_use_ext" value="false" />
         <boolean name="use_custom_video_ui" value="true" />
         <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true" />
+        <boolean name="config_carrier_specific_network_type_display" value="true"/>
         <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="config_dds_switch_alert_dialog_supported" 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" />
+        <boolean name="transmit_static_image" value="true"/>
+        <boolean name="show_static_image_ui" value="true"/>
+        <boolean name="config_dds_switch_alert_dialog_supported" 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_with_iccids_array" num="6">
-            <item value="iccid" />
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874" />
-            <item value="type" />
-            <item value="ims,emergency" />
-            <item value="include_common_rules" />
-            <item value="false" />
+            <item value="iccid"/>
+            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
+            <item value="type"/>
+            <item value="ims,emergency"/>
+            <item value="include_common_rules"/>
+            <item value="false"/>
         </string-array>
         <boolean name="show_video_quality_ui" value="true" />
         <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true" />
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="carrier_supports_multianchor_conference" value="true" />
+        <boolean name="config_retry_sms_over_ims" value="true"/>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="carrier_supports_multianchor_conference" value="true"/>
     </carrier_config>
+
     <carrier_config mcc="440" mnc="10">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="440" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="440" mnc="20">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="440" mnc="50">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="440" mnc="51">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="440" mnc="53">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="450" mnc="5">
+
+    <carrier_config mcc="450" mnc="05">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="allow_video_call_in_low_battery" value="false" />
         <boolean name="config_carrier_cs_retry_available" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
-    <carrier_config mcc="450" mnc="6">
+
+    <carrier_config mcc="450" mnc="06">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="allow_video_call_in_low_battery" value="false" />
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
-    <carrier_config mcc="450" mnc="8">
+
+    <carrier_config mcc="450" mnc="08">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="allow_video_call_in_low_battery" value="false" />
         <boolean name="config_carrier_cs_retry_available" value="true" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
-    <carrier_config mcc="454" mnc="0">
+
+    <carrier_config mcc="454" mnc="00">
         <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" />
     </carrier_config>
-    <carrier_config mcc="454" mnc="3">
+
+    <carrier_config mcc="454" 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" />
     </carrier_config>
-    <carrier_config mcc="454" mnc="4">
+
+    <carrier_config mcc="454" mnc="04">
         <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" />
     </carrier_config>
+
     <carrier_config mcc="454" mnc="31">
         <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" />
     </carrier_config>
-    <carrier_config mcc="455" mnc="2">
+
+    <carrier_config mcc="455" 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="check_mobile_data_for_cf" value="true" />
         <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="supl,mms" />
+            <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>
+            <string name="protocol">IPV4V6</string>
+            <string name="roaming_protocol">IPV4V6</string>
         </map>
         <string-array name="carrier_metered_apn_types_strings" num="3">
             <item value="default" />
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <boolean name="config_update_service_status" value="true" />
+        <boolean name="config_update_service_status" value="true"/>
     </carrier_config>
-    <carrier_config mcc="455" mnc="7">
+
+    <carrier_config mcc="455" 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="check_mobile_data_for_cf" value="true" />
         <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="supl,mms" />
+            <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>
+            <string name="protocol">IPV4V6</string>
+            <string name="roaming_protocol">IPV4V6</string>
         </map>
         <string-array name="carrier_metered_apn_types_strings" num="3">
             <item value="default" />
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <boolean name="config_update_service_status" value="true" />
+        <boolean name="config_update_service_status" value="true"/>
     </carrier_config>
-    <carrier_config mcc="460" mnc="0">
+
+    <carrier_config mcc="460" mnc="00">
         <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" />
@@ -1252,20 +1421,18 @@
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_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="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" />
+        <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" />
+            <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>
+            <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" />
@@ -1277,7 +1444,7 @@
         <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="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" />
@@ -1288,10 +1455,9 @@
         <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="true" />
-        <boolean name="support_video_conference_call_bool" value="false" />
+        <string name="carrier_name_string">China Mobile</string>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="support_video_conference_call_bool" value="false"/>
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
@@ -1300,31 +1466,28 @@
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="1">
+
+    <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" />
+        <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" />
+            <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>
+            <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="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" />
-        <boolean name="carrier_name_override_bool" value="true" />
-        <string name="carrier_name_string">China Unicom
-        </string>
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="config_update_volte_icon" value="true" />
+        <string name="carrier_name_string">China Unicom</string>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="config_update_volte_icon" value="true"/>
         <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" />
@@ -1335,7 +1498,8 @@
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="2">
+
+    <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" />
@@ -1344,20 +1508,18 @@
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_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="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" />
+        <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" />
+            <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>
+            <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" />
@@ -1369,7 +1531,7 @@
         <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="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" />
@@ -1380,10 +1542,9 @@
         <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="true" />
-        <boolean name="support_video_conference_call_bool" value="false" />
+        <string name="carrier_name_string">China Mobile</string>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="support_video_conference_call_bool" value="false"/>
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
@@ -1392,26 +1553,25 @@
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="3">
+
+    <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" />
+        <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" />
+            <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>
+            <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="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" />
@@ -1421,7 +1581,7 @@
         <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="true" />
+        <boolean name="config_update_service_status" value="true"/>
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="config_common_callsettings_support_bool" value="true" />
@@ -1430,65 +1590,56 @@
         <boolean name="config_disable_clir_over_ut" value="true" />
         <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
-        <boolean name="support_swap_after_merge_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
-        <boolean name="disable_filter_out_conference_host" value="true" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="4">
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+
+    <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>
+            <string name="protocol">IPV4V6</string>
+            <string name="roaming_protocol">IPV4V6</string>
         </map>
     </carrier_config>
-    <carrier_config mcc="460" mnc="5">
+
+    <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" />
+        <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>
+            <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="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="true" />
+        <boolean name="config_update_service_status" 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="hide_enabled_5g_bool" value="false" />
-        <boolean name="support_swap_after_merge_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
-        <boolean name="disable_filter_out_conference_host" value="true" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="6">
+
+    <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" />
+        <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>
+            <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="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" />
-        <boolean name="carrier_name_override_bool" value="true" />
-        <string name="carrier_name_string">China Unicom
-        </string>
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="config_update_volte_icon" value="true" />
+        <string name="carrier_name_string">China Unicom</string>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="config_update_volte_icon" value="true"/>
         <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" />
@@ -1499,7 +1650,8 @@
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="7">
+
+    <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" />
@@ -1508,20 +1660,18 @@
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_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="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" />
+        <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" />
+            <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>
+            <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" />
@@ -1533,7 +1683,7 @@
         <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="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" />
@@ -1544,8 +1694,8 @@
         <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="true" />
-        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="support_video_conference_call_bool" value="false"/>
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
@@ -1554,7 +1704,8 @@
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="8">
+
+    <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" />
@@ -1562,20 +1713,18 @@
         <boolean name="check_mobile_data_for_cf" value="true" />
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_over_ims" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" 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" />
+        <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" />
+            <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>
+            <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" />
@@ -1587,7 +1736,7 @@
         <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="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" />
@@ -1598,8 +1747,8 @@
         <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="true" />
-        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="support_video_conference_call_bool" value="false"/>
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
@@ -1608,26 +1757,23 @@
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="9">
+
+    <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" />
+        <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>
+            <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="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" />
-        <boolean name="carrier_name_override_bool" value="true" />
-        <string name="carrier_name_string">China Unicom
-        </string>
-        <boolean name="config_update_service_status" value="true" />
-        <boolean name="config_update_volte_icon" value="true" />
+        <string name="carrier_name_string">China Unicom</string>
+        <boolean name="config_update_service_status" value="true"/>
+        <boolean name="config_update_volte_icon" value="true"/>
         <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" />
@@ -1638,16 +1784,16 @@
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="460" mnc="10">
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+        <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>
+            <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" />
@@ -1655,19 +1801,17 @@
         <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="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" />
+            <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>
+            <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="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" />
@@ -1677,7 +1821,7 @@
         <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="true" />
+        <boolean name="config_update_service_status" value="true"/>
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="config_common_callsettings_support_bool" value="true" />
@@ -1686,10 +1830,9 @@
         <boolean name="config_disable_clir_over_ut" value="true" />
         <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
-        <boolean name="support_swap_after_merge_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
-        <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" />
@@ -1697,19 +1840,17 @@
         <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="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" />
+            <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>
+            <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="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" />
@@ -1723,467 +1864,484 @@
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="460" mnc="15">
         <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="carrier_allow_transfer_ims_call_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="310" mnc="0">
-        <boolean name="rtt_auto_upgrade_bool" value="true" />
+
+    <carrier_config mcc="310" mnc="00">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="rtt_supported_for_vt_bool" value="true"/>
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" 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_video_calls_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="true" />
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-        <boolean name="carrier_call_composer_supported_bool" value="true" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_call_composer_supported_bool" value="true"/>
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
-    <carrier_config mcc="310" mnc="1">
-        <boolean name="rtt_auto_upgrade_bool" value="true" />
+
+    <carrier_config mcc="310" mnc="01">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_auto_upgrade_bool" value="true" />
+        <boolean name="rtt_supported_for_vt_bool" value="true"/>
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" 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_video_calls_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="true" />
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-        <boolean name="carrier_call_composer_supported_bool" value="true" />
+        <boolean name="carrier_call_composer_supported_bool" value="true"/>
     </carrier_config>
-    <carrier_config mcc="310" mnc="30">
+
+    <carrier_config mcc="310" mnc="030">
         <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_display_14digit_imei" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="310" mnc="70">
+
+    <carrier_config mcc="310" mnc="070">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
-    <carrier_config mcc="310" mnc="80">
+
+    <carrier_config mcc="310" mnc="080">
         <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_display_14digit_imei" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
-    <carrier_config mcc="310" mnc="90">
+
+    <carrier_config mcc="310" mnc="090">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="310" mnc="30">
+
+    <carrier_config mcc="310" mnc="030">
         <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_display_14digit_imei" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="150">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="170">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="280">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="380">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="410">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_name_override_bool" value="false" />
-        <string name="carrier_name_string" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="560">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="680">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="980">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="310" mnc="260">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_auto_upgrade_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="false" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
-        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true" />
-        <boolean name="allow_one_way_accept_video_call" value="false" />
-        <boolean name="carrier_call_composer_supported_bool" value="true" />
+        <boolean name="rtt_supported_for_vt_bool" value="false"/>
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
+        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
+        <boolean name="allow_one_way_accept_video_call" value="false"/>
+        <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="160">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="200">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="210">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_auto_upgrade_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="false" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
-        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true" />
-        <boolean name="allow_one_way_accept_video_call" value="false" />
-        <boolean name="carrier_call_composer_supported_bool" value="true" />
+        <boolean name="rtt_supported_for_vt_bool" value="false"/>
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
+        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
+        <boolean name="allow_one_way_accept_video_call" value="false"/>
+        <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="220">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="230">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="240">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="250">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="270">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </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="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_auto_upgrade_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="false" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
-        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true" />
-        <boolean name="allow_one_way_accept_video_call" value="false" />
-        <boolean name="carrier_call_composer_supported_bool" value="true" />
+        <boolean name="rtt_supported_for_vt_bool" value="false"/>
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
+        <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
+        <boolean name="allow_one_way_accept_video_call" value="false"/>
+        <boolean name="carrier_call_composer_supported_bool" value="true"/>
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="490">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="530">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="580">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="590">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="640">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="660">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="800">
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="311" mnc="0">
+
+    <carrier_config mcc="311" mnc="00">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_for_vt_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
+        <boolean name="rtt_supported_for_vt_bool" value="true"/>
+        <boolean name="rtt_upgrade_supported_bool" 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="carrier_volte_tty_supported_bool" value="true" />
     </carrier_config>
+
     <carrier_config mcc="311" mnc="180">
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" 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="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="rtt_supported_for_vt_bool" value="false" />
-        <boolean name="rtt_upgrade_supported_bool" value="false" />
-        <boolean name="support_emergency_sms_over_ims_bool" value="true" />
-        <boolean name="support_downgrade_vt_to_audio_bool" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false"/>
+        <boolean name="rtt_supported_for_vt_bool" value="false"/>
+        <boolean name="rtt_upgrade_supported_bool" value="false"/>
         <boolean name="carrier_vt_tty_support_bool" value="true" />
-        <boolean name="carrier_call_composer_supported_bool" value="true" />
-        <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
-    </carrier_config>
-    <carrier_config device="kona" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="lito" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="atoll" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="lahaina" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="holi" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
+        <boolean name="support_downgrade_vt_to_audio_bool" value="true" />
+        <boolean name="support_emergency_sms_over_ims_bool" value="true" />
+        <boolean name="carrier_call_composer_supported_bool" value="true"/>
+        <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     </carrier_config>
+
     <carrier_config mcc="312" mnc="530">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <string-array name="mmi_two_digit_number_pattern_string_array" num="3">
-            <item value="0" />
-            <item value="0" />
-            <item value="*2" />
+        <item value="0"/>
+        <item value="00"/>
+        <item value="*2"/>
         </string-array>
     </carrier_config>
+
     <carrier_config mcc="312" mnc="670">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="313" mnc="100">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="use_wfc_home_network_mode_in_roaming_network_bool" value="true" />
         <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-            <item value="0" />
-            <item value="0" />
-            <item value="*0" />
-            <item value="*1" />
-            <item value="*2" />
-            <item value="*3" />
-            <item value="*4" />
-            <item value="*5" />
-            <item value="*6" />
-            <item value="*7" />
-            <item value="*8" />
-            <item value="*9" />
-            <item value="#0" />
-            <item value="#1" />
-            <item value="#2" />
-            <item value="#3" />
-            <item value="#4" />
-            <item value="#5" />
-            <item value="#6" />
-            <item value="#7" />
-            <item value="#8" />
-            <item value="#9" />
+        <item value="0"/>
+        <item value="00"/>
+        <item value="*0"/>
+        <item value="*1"/>
+        <item value="*2"/>
+        <item value="*3"/>
+        <item value="*4"/>
+        <item value="*5"/>
+        <item value="*6"/>
+        <item value="*7"/>
+        <item value="*8"/>
+        <item value="*9"/>
+        <item value="#0"/>
+        <item value="#1"/>
+        <item value="#2"/>
+        <item value="#3"/>
+        <item value="#4"/>
+        <item value="#5"/>
+        <item value="#6"/>
+        <item value="#7"/>
+        <item value="#8"/>
+        <item value="#9"/>
         </string-array>
     </carrier_config>
+
     <carrier_config mcc="313" mnc="110">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="313" mnc="120">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="313" mnc="130">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="313" mnc="140">
         <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_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true" />
+        <boolean name="transmit_static_image" value="true"/>
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
     </carrier_config>
+
     <carrier_config mcc="310" mnc="120">
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_upgrade_supported_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
+        <boolean name="rtt_upgrade_supported_bool" value="true"/>
+        <boolean name="rtt_downgrade_supported_bool" value="true"/>
         <boolean name="rtt_auto_upgrade_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+
     <carrier_config>
         <string-array name="ratchet_rat_families" num="3">
-            <item value="1,2" />
-            <item value="7,8,12" />
-            <item value="3,11,9,10,15" />
+        <item value="1,2" />
+        <item value="7,8,12" />
+        <item value="3,11,9,10,15" />
         </string-array>
     </carrier_config>
 </carrier_config_list>