change string value from node attribite to textNode

As framework doesn't support reading string xml value from
node attribute today, update the actual config value from xml
node attribute to a textNode.

Bug: 130620593
Test: Manual test
Change-Id: Ia2285dd945b211748926413f89efd83f8ea16e30

69 files changed, 199 insertions, 199 deletions

diff --git a/assets/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml b/assets/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml
index 753dcce..cac305e 100644
--- a/assets/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml
+++ b/assets/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1228800"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1187_AT&T.xml b/assets/carrier_config_carrierid_1187_AT&T.xml
index a21cc8a..ec15e2e 100644
--- a/assets/carrier_config_carrierid_1187_AT&T.xml
+++ b/assets/carrier_config_carrierid_1187_AT&T.xml
@@ -11,7 +11,7 @@
     <int name="maxMessageSize" value="1048576"/>
     <int name="recipientLimit" value="10"/>
     <int name="volte_replacement_rat_int" value="3"/>
-    <string name="carrier_name_string" value="AT&amp;T"/>
+    <string name="carrier_name_string">AT&amp;T</string>
     <string-array name="carrier_data_call_retry_config_strings" num="3">
         <item value="default:default_randomization=2000,10000,18000:5000,720000:5000,2160000:5000"/>
         <item value="mms:default_randomization=2000,10000,18000:5000,720000:5000,2160000:5000"/>
diff --git a/assets/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml b/assets/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml
index a43a534..2745db4 100644
--- a/assets/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml
+++ b/assets/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml b/assets/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml
index 753dcce..cac305e 100644
--- a/assets/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml
+++ b/assets/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1228800"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1329_Vodafone-Albania.xml b/assets/carrier_config_carrierid_1329_Vodafone-Albania.xml
index d74f1ac..c66b628 100644
--- a/assets/carrier_config_carrierid_1329_Vodafone-Albania.xml
+++ b/assets/carrier_config_carrierid_1329_Vodafone-Albania.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="default_vm_number_string" value="135"/>
+    <string name="default_vm_number_string">135</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1345_Telstra.xml b/assets/carrier_config_carrierid_1345_Telstra.xml
index eca6fa3..e676244 100644
--- a/assets/carrier_config_carrierid_1345_Telstra.xml
+++ b/assets/carrier_config_carrierid_1345_Telstra.xml
@@ -5,7 +5,7 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="maxMessageSize" value="2097152"/>
-    <string name="default_vm_number_string" value="+61101"/>
+    <string name="default_vm_number_string">+61101</string>
     <string-array name="carrier_metered_apn_types_strings" num="3">
         <item value="default"/>
         <item value="dun"/>
diff --git a/assets/carrier_config_carrierid_1403_Rogers.xml b/assets/carrier_config_carrierid_1403_Rogers.xml
index 7544e63..c7059d3 100644
--- a/assets/carrier_config_carrierid_1403_Rogers.xml
+++ b/assets/carrier_config_carrierid_1403_Rogers.xml
@@ -11,8 +11,8 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="carrier_name_string" value="Rogers"/>
-    <string name="gps.lpp_profile" value="2"/>
+    <string name="carrier_name_string">Rogers</string>
+    <string name="gps.lpp_profile">2</string>
     <string-array name="read_only_apn_types_string_array" num="1">
         <item value="*"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml b/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
index c1e1049..f9f9c61 100644
--- a/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
+++ b/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
@@ -10,7 +10,7 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="recipientLimit" value="10"/>
     <int name="smsToMmsTextThreshold" value="5"/>
-    <string name="gps.lpp_profile" value="3"/>
+    <string name="gps.lpp_profile">3</string>
     <string-array name="read_only_apn_types_string_array" num="1">
         <item value="*"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_1454_o2.xml b/assets/carrier_config_carrierid_1454_o2.xml
index c74e2ec..dd29ae6 100644
--- a/assets/carrier_config_carrierid_1454_o2.xml
+++ b/assets/carrier_config_carrierid_1454_o2.xml
@@ -5,5 +5,5 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="maxMessageSize" value="614400"/>
-    <string name="default_vm_number_string" value="+491793000333"/>
+    <string name="default_vm_number_string">+491793000333</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1492_O2.xml b/assets/carrier_config_carrierid_1492_O2.xml
index 3713fe1..48b1b3a 100644
--- a/assets/carrier_config_carrierid_1492_O2.xml
+++ b/assets/carrier_config_carrierid_1492_O2.xml
@@ -4,7 +4,7 @@
     <boolean name="prefer_2g_bool" value="false"/>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string" value="901"/>
+    <string name="default_vm_number_string">901</string>
     <string-array name="non_roaming_operator_string_array" num="8">
         <item value="23420"/>
         <item value="23426"/>
diff --git a/assets/carrier_config_carrierid_14_A1.xml b/assets/carrier_config_carrierid_14_A1.xml
index 0830348..9c62a46 100644
--- a/assets/carrier_config_carrierid_14_A1.xml
+++ b/assets/carrier_config_carrierid_14_A1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string name="default_vm_number_string" value="66477"/>
+    <string name="default_vm_number_string">66477</string>
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="23201"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_1507_Manx-Telecom.xml b/assets/carrier_config_carrierid_1507_Manx-Telecom.xml
index 1a4fdad..ccc8cbf 100644
--- a/assets/carrier_config_carrierid_1507_Manx-Telecom.xml
+++ b/assets/carrier_config_carrierid_1507_Manx-Telecom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string name="default_vm_number_string" value="121"/>
+    <string name="default_vm_number_string">121</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml b/assets/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml
index a43a534..2745db4 100644
--- a/assets/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml
+++ b/assets/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1788_Sprint.xml b/assets/carrier_config_carrierid_1788_Sprint.xml
index 6f28f9a..09d5d27 100644
--- a/assets/carrier_config_carrierid_1788_Sprint.xml
+++ b/assets/carrier_config_carrierid_1788_Sprint.xml
@@ -26,9 +26,9 @@
     <int name="recipientLimit" value="40"/>
     <int name="smsToMmsTextThreshold" value="6"/>
     <int name="volte_replacement_rat_int" value="6"/>
-    <string name="carrier_eri_file_name_string" value="eri_310120.xml"/>
-    <string name="carrier_name_string" value="Sprint"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##"/>
-    <string name="naiSuffix" value=":pcs"/>
+    <string name="carrier_eri_file_name_string">eri_310120.xml</string>
+    <string name="carrier_name_string">Sprint</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+    <string name="naiSuffix">:pcs</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1789_Carolina-West-Wireless.xml b/assets/carrier_config_carrierid_1789_Carolina-West-Wireless.xml
index a43a534..2745db4 100644
--- a/assets/carrier_config_carrierid_1789_Carolina-West-Wireless.xml
+++ b/assets/carrier_config_carrierid_1789_Carolina-West-Wireless.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml b/assets/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml
index edc2901..5823f95 100644
--- a/assets/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml
+++ b/assets/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml
@@ -11,5 +11,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="8388608"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml b/assets/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml
index 753dcce..cac305e 100644
--- a/assets/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml
+++ b/assets/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1228800"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1829_James-Valley.xml b/assets/carrier_config_carrierid_1829_James-Valley.xml
index 32b4206..d1bfa24 100644
--- a/assets/carrier_config_carrierid_1829_James-Valley.xml
+++ b/assets/carrier_config_carrierid_1829_James-Valley.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1258291"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1836_C-Spire.xml b/assets/carrier_config_carrierid_1836_C-Spire.xml
index b424249..3c7a7f0 100644
--- a/assets/carrier_config_carrierid_1836_C-Spire.xml
+++ b/assets/carrier_config_carrierid_1836_C-Spire.xml
@@ -12,7 +12,7 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-CS3G-MDN: 1##LINE1NOCOUNTRYCODE##"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <string name="sim_country_iso_override_string" value="us"/>
+    <string name="httpParams">X-CS3G-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="sim_country_iso_override_string">us</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
index 16a7ef2..b04d7a5 100644
--- a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
+++ b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
@@ -61,13 +61,13 @@
     <int name="smsToMmsTextThreshold" value="7"/>
     <int name="volte_replacement_rat_int" value="6"/>
     <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_eri_file_name_string" value="eri_311480.xml"/>
-    <string name="carrier_name_string" value="Verizon"/>
-    <string name="default_vm_number_string" value="*86"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <string name="httpParams" value="x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##"/>
-    <string name="uaProfTagName" value="Profile"/>
-    <string name="sim_country_iso_override_string" value="us"/>
+    <string name="carrier_eri_file_name_string">eri_311480.xml</string>
+    <string name="carrier_name_string">Verizon</string>
+    <string name="default_vm_number_string">*86</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+    <string name="uaProfTagName">Profile</string>
+    <string name="sim_country_iso_override_string">us</string>
     <string-array name="boosted_lte_earfcns_string_array" num="2">
         <item value="600-1199"/>
         <item value="1950-2399"/>
diff --git a/assets/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml b/assets/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml
index a43a534..2745db4 100644
--- a/assets/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml
+++ b/assets/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1848_Chat-Mobility.xml b/assets/carrier_config_carrierid_1848_Chat-Mobility.xml
index 1cfe186..f226468 100644
--- a/assets/carrier_config_carrierid_1848_Chat-Mobility.xml
+++ b/assets/carrier_config_carrierid_1848_Chat-Mobility.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <boolean name="enableMultipartSMS" value="true"/>
     <boolean name="enabledMMS" value="true"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
     <int name="maxImageHeight" value="2432"/>
     <int name="maxImageWidth" value="4320"/>
     <int name="maxMessageSize" value="1048576"/>
@@ -10,4 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="recipientLimit" value="20"/>
     <int name="smsToMmsTextThreshold" value="1"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml b/assets/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml
index 5f5c72e..7731edb 100644
--- a/assets/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml
+++ b/assets/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml
@@ -11,5 +11,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1228800"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1853_Virgin-Mobile.xml b/assets/carrier_config_carrierid_1853_Virgin-Mobile.xml
index 21f0709..8c3a00a 100644
--- a/assets/carrier_config_carrierid_1853_Virgin-Mobile.xml
+++ b/assets/carrier_config_carrierid_1853_Virgin-Mobile.xml
@@ -18,8 +18,8 @@
     <int name="maxMessageSize" value="1048576"/>
     <int name="cdma_3waycall_flash_delay_int" value="300"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <string name="naiSuffix" value=":pcs"/>
-    <string name="carrier_eri_file_name_string" value="eri_311490.xml"/>
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="naiSuffix">:pcs</string>
+    <string name="carrier_eri_file_name_string">eri_311490.xml</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1890_KT.xml b/assets/carrier_config_carrierid_1890_KT.xml
index 17ede53..697b344 100644
--- a/assets/carrier_config_carrierid_1890_KT.xml
+++ b/assets/carrier_config_carrierid_1890_KT.xml
@@ -11,6 +11,6 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="maxMessageSize" value="1048576"/>
-    <string name="carrier_instant_lettering_encoding_string" value="EUC-KR"/>
-    <string name="carrier_instant_lettering_invalid_chars_string" value="[&quot;&lt;&gt;\\\n]"/>
+    <string name="carrier_instant_lettering_encoding_string">EUC-KR</string>
+    <string name="carrier_instant_lettering_invalid_chars_string">["&lt;&gt;\\\n]</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1891_SK-Telecom.xml b/assets/carrier_config_carrierid_1891_SK-Telecom.xml
index 3a70b92..add098e 100644
--- a/assets/carrier_config_carrierid_1891_SK-Telecom.xml
+++ b/assets/carrier_config_carrierid_1891_SK-Telecom.xml
@@ -11,7 +11,7 @@
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="carrier_instant_lettering_length_limit_int" value="16"/>
-    <string name="carrier_instant_lettering_invalid_chars_string" value="[\n]"/>
-    <string name="carrier_instant_lettering_escaped_chars_string" value="&quot;\"/>
-    <string name="carrier_instant_lettering_encoding_string" value="EUC-KR"/>
+    <string name="carrier_instant_lettering_invalid_chars_string">[\n]</string>
+    <string name="carrier_instant_lettering_escaped_chars_string">"\</string>
+    <string name="carrier_instant_lettering_encoding_string">EUC-KR</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1892_LG-U.xml b/assets/carrier_config_carrierid_1892_LG-U.xml
index 97e17b2..19d39a8 100644
--- a/assets/carrier_config_carrierid_1892_LG-U.xml
+++ b/assets/carrier_config_carrierid_1892_LG-U.xml
@@ -16,7 +16,7 @@
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="carrier_instant_lettering_length_limit_int" value="64"/>
-    <string name="carrier_instant_lettering_invalid_chars_string" value="[&quot;&lt;&gt;\\\n]"/>
-    <string name="carrier_instant_lettering_encoding_string" value="EUC-KR"/>
-    <string name="carrier_name_string" value="LG U+"/>
+    <string name="carrier_instant_lettering_invalid_chars_string">["&lt;&gt;\\\n]</string>
+    <string name="carrier_instant_lettering_encoding_string">EUC-KR</string>
+    <string name="carrier_name_string">LG U+</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1894_SoftBank.xml b/assets/carrier_config_carrierid_1894_SoftBank.xml
index 234c21b..1423072 100644
--- a/assets/carrier_config_carrierid_1894_SoftBank.xml
+++ b/assets/carrier_config_carrierid_1894_SoftBank.xml
@@ -16,5 +16,5 @@
     <int name="volte_replacement_rat_int" value="3"/>
     <int name="ims_dtmf_tone_delay_int" value="215"/>
     <long name="message_expiration_time_long" value="3600000"/>
-    <string name="default_vm_number_string" value="1416"/>
+    <string name="default_vm_number_string">1416</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml b/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml
index 9cac9c9..a4af353 100644
--- a/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml
+++ b/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml
@@ -6,5 +6,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="sim_country_iso_override_string" value="ca"/>
+    <string name="sim_country_iso_override_string">ca</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1909_Euskaltel.xml b/assets/carrier_config_carrierid_1909_Euskaltel.xml
index 67b94c0..c4e2af0 100644
--- a/assets/carrier_config_carrierid_1909_Euskaltel.xml
+++ b/assets/carrier_config_carrierid_1909_Euskaltel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string name="sim_country_iso_override_string" value="es"/>
+    <string name="sim_country_iso_override_string">es</string>
     <string-array name="non_roaming_operator_string_array" num="19">
         <item value="21401"/>
         <item value="21402"/>
diff --git a/assets/carrier_config_carrierid_1912_AT&T-MX.xml b/assets/carrier_config_carrierid_1912_AT&T-MX.xml
index b7b2e28..7931781 100644
--- a/assets/carrier_config_carrierid_1912_AT&T-MX.xml
+++ b/assets/carrier_config_carrierid_1912_AT&T-MX.xml
@@ -2,5 +2,5 @@
 <carrier_config>
     <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
     <boolean name="skip_cf_fail_to_disable_dialog_bool" value="true"/>
-    <string name="sim_country_iso_override_string" value="mx"/>
+    <string name="sim_country_iso_override_string">mx</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1951_Boost-Mobile.xml b/assets/carrier_config_carrierid_1951_Boost-Mobile.xml
index 86d0435..7ace583 100644
--- a/assets/carrier_config_carrierid_1951_Boost-Mobile.xml
+++ b/assets/carrier_config_carrierid_1951_Boost-Mobile.xml
@@ -15,8 +15,8 @@
     <int name="maxMessageSize" value="1048576"/>
     <int name="cdma_3waycall_flash_delay_int" value="300"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <string name="naiSuffix" value=":pcs"/>
-    <string name="carrier_eri_file_name_string" value="eri_311870.xml"/>
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="naiSuffix">:pcs</string>
+    <string name="carrier_eri_file_name_string">eri_311870.xml</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1952_US-Cellular.xml b/assets/carrier_config_carrierid_1952_US-Cellular.xml
index d91b364..c36e50d 100644
--- a/assets/carrier_config_carrierid_1952_US-Cellular.xml
+++ b/assets/carrier_config_carrierid_1952_US-Cellular.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="allowAttachAudio" value="true"/>
-    <string name="carrier_eri_file_name_string" value="eri_311220.xml"/>
-    <int name="cdma_3waycall_flash_delay_int" value="300"/>
     <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <string name="emailGatewayNumber" value="6245"/>
     <boolean name="enableMMSReadReports" value="false"/>
     <boolean name="enableMultipartSMS" value="false"/>
     <boolean name="enabledNotifyWapMMSC" value="true"/>
     <boolean name="enabledTransID" value="true"/>
-    <string name="httpParams" value="x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##"/>
+    <boolean name="show_apn_setting_cdma_bool" value="true"/>
+    <boolean name="show_cdma_choices_bool" value="true"/>
+    <boolean name="support_swap_after_merge_bool" value="false"/>
+    <boolean name="use_otasp_for_provisioning_bool" value="true"/>
+    <int name="cdma_3waycall_flash_delay_int" value="300"/>
     <int name="maxImageHeight" value="1944"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxSubjectLength" value="80"/>
     <int name="recipientLimit" value="20"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="show_cdma_choices_bool" value="true"/>
-    <string name="sim_country_iso_override_string" value="us"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <string name="uaProfTagName" value="x-wap-profile"/>
-    <boolean name="use_otasp_for_provisioning_bool" value="true"/>
+    <string name="carrier_eri_file_name_string">eri_311220.xml</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+    <string name="sim_country_iso_override_string">us</string>
+    <string name="uaProfTagName">x-wap-profile</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1961_Airtel.xml b/assets/carrier_config_carrierid_1961_Airtel.xml
index e2d62e1..cae4ecf 100644
--- a/assets/carrier_config_carrierid_1961_Airtel.xml
+++ b/assets/carrier_config_carrierid_1961_Airtel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="airtel"/>
+    <string name="carrier_name_string">airtel</string>
     <string-array name="roaming_operator_string_array" num="2">
         <item value="404"/>
         <item value="405"/>
diff --git a/assets/carrier_config_carrierid_1962_Fido.xml b/assets/carrier_config_carrierid_1962_Fido.xml
index d277cad..e848208 100644
--- a/assets/carrier_config_carrierid_1962_Fido.xml
+++ b/assets/carrier_config_carrierid_1962_Fido.xml
@@ -9,8 +9,8 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="carrier_name_string" value="Fido"/>
-    <string name="gps.lpp_profile" value="2"/>
+    <string name="carrier_name_string">Fido</string>
+    <string name="gps.lpp_profile">2</string>
     <string-array name="read_only_apn_types_string_array" num="1">
         <item value="*"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_1964_Aio.xml b/assets/carrier_config_carrierid_1964_Aio.xml
index 501675a..3c6c6f2 100644
--- a/assets/carrier_config_carrierid_1964_Aio.xml
+++ b/assets/carrier_config_carrierid_1964_Aio.xml
@@ -6,7 +6,7 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="carrier_name_string" value="AT&amp;T"/>
+    <string name="carrier_name_string">AT&amp;T</string>
     <string-array name="roaming_operator_string_array" num="5">
         <item value="310110"/>
         <item value="310140"/>
diff --git a/assets/carrier_config_carrierid_1989_Google-Fi.xml b/assets/carrier_config_carrierid_1989_Google-Fi.xml
index bf74d4c..270287b 100644
--- a/assets/carrier_config_carrierid_1989_Google-Fi.xml
+++ b/assets/carrier_config_carrierid_1989_Google-Fi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="Google Fi"/>
-    <string name="sim_country_iso_override_string" value="us"/>
+    <string name="carrier_name_string">Google Fi</string>
+    <string name="sim_country_iso_override_string">us</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1990_Golan-Telecom.xml b/assets/carrier_config_carrierid_1990_Golan-Telecom.xml
index 8e8e982..01de36f 100644
--- a/assets/carrier_config_carrierid_1990_Golan-Telecom.xml
+++ b/assets/carrier_config_carrierid_1990_Golan-Telecom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="Golan Telecom"/>
+    <string name="carrier_name_string">Golan Telecom</string>
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="42502"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_1991_Hot-Mobile.xml b/assets/carrier_config_carrierid_1991_Hot-Mobile.xml
index bf00c5d..9c19b4e 100644
--- a/assets/carrier_config_carrierid_1991_Hot-Mobile.xml
+++ b/assets/carrier_config_carrierid_1991_Hot-Mobile.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="HOT mobile"/>
-    <string name="sim_country_iso_override_string" value="il"/>
+    <string name="carrier_name_string">HOT mobile</string>
+    <string name="sim_country_iso_override_string">il</string>
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="42503"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_1_T-Mobile-US.xml b/assets/carrier_config_carrierid_1_T-Mobile-US.xml
index b49be83..24dc75e 100644
--- a/assets/carrier_config_carrierid_1_T-Mobile-US.xml
+++ b/assets/carrier_config_carrierid_1_T-Mobile-US.xml
@@ -15,10 +15,10 @@
     <int name="volte_replacement_rat_int" value="3"/>
     <int name="vvm_port_number_int" value="1808"/>
     <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_name_string" value="T-Mobile"/>
-    <string name="carrier_vvm_package_name_string" value="com.tmobile.vvm.application"/>
-    <string name="vvm_destination_number_string" value="122"/>
-    <string name="vvm_type_string" value="vvm_type_cvvm"/>
+    <string name="carrier_name_string">T-Mobile</string>
+    <string name="carrier_vvm_package_name_string">com.tmobile.vvm.application</string>
+    <string name="vvm_destination_number_string">122</string>
+    <string name="vvm_type_string">vvm_type_cvvm</string>
     <string-array name="wfc_operator_error_codes_string_array" num="1">
         <item value="REG09|0"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_2011_Inland-Cellular.xml b/assets/carrier_config_carrierid_2011_Inland-Cellular.xml
index e16e26e..5c00027 100644
--- a/assets/carrier_config_carrierid_2011_Inland-Cellular.xml
+++ b/assets/carrier_config_carrierid_2011_Inland-Cellular.xml
@@ -14,6 +14,6 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1228800"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
-    <string name="carrier_name_string" value="T-Mobile"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
+    <string name="carrier_name_string">T-Mobile</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2018_Reliance-Jio.xml b/assets/carrier_config_carrierid_2018_Reliance-Jio.xml
index 3eb3a12..d7e1fb9 100644
--- a/assets/carrier_config_carrierid_2018_Reliance-Jio.xml
+++ b/assets/carrier_config_carrierid_2018_Reliance-Jio.xml
@@ -4,7 +4,7 @@
     <boolean name="carrier_volte_available_bool" value="true"/>
     <boolean name="hide_ims_apn_bool" value="true"/>
     <int name="volte_replacement_rat_int" value="3"/>
-    <string name="carrier_name_string" value="JIO"/>
+    <string name="carrier_name_string">JIO</string>
     <string-array name="roaming_operator_string_array" num="2">
         <item value="404"/>
         <item value="405"/>
diff --git a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml
index e67b42d..e9bbf03 100644
--- a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml
+++ b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml
@@ -1,24 +1,83 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="aliasEnabled" value="true"/>
-    <int name="aliasMaxChars" value="48"/>
-    <int name="aliasMinChars" value="2"/>
     <boolean name="allowAttachAudio" value="false"/>
     <boolean name="allow_add_call_during_video_call" value="false"/>
     <boolean name="allow_adding_apns_bool" value="false"/>
     <boolean name="allow_hold_in_ims_call" value="false"/>
     <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false"/>
     <boolean name="apn_expand_bool" value="false"/>
+    <boolean name="broadcast_emergency_call_state_changes_bool" value="true"/>
+    <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
+    <boolean name="carrier_name_override_bool" value="true"/>
+    <boolean name="carrier_promote_wfc_on_call_fail_bool" value="true"/>
+    <boolean name="carrier_volte_available_bool" value="true"/>
+    <boolean name="carrier_volte_provisioned_bool" value="true"/>
+    <boolean name="carrier_volte_provisioning_required_bool" value="true"/>
+    <boolean name="carrier_vt_available_bool" value="true"/>
+    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
+    <boolean name="cdma_home_registered_plmn_name_override_bool" value="true"/>
+    <boolean name="disable_severe_when_extreme_disabled_bool" value="false"/>
+    <boolean name="disable_voice_barring_notification_bool" value="true"/>
+    <boolean name="drop_video_call_when_answering_audio_call_bool" value="true"/>
+    <boolean name="dtmf_type_enabled_bool" value="true"/>
+    <boolean name="editable_wfc_mode_bool" value="false"/>
+    <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
+    <boolean name="enableMMSReadReports" value="false"/>
+    <boolean name="enableMultipartSMS" value="true"/>
+    <boolean name="enabledNotifyWapMMSC" value="true"/>
+    <boolean name="enabledTransID" value="true"/>
+    <boolean name="gps.persist_lpp_mode_bool" value="true"/>
+    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
+    <boolean name="mdn_is_additional_voicemail_number_bool" value="true"/>
+    <boolean name="mmsCloseConnection" value="true"/>
+    <boolean name="notify_handover_video_from_lte_to_wifi_bool" value="true"/>
+    <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/>
+    <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/>
+    <boolean name="operator_selection_expand_bool" value="true"/>
+    <boolean name="prefer_2g_bool" value="false"/>
+    <boolean name="rtt_supported_bool" value="true"/>
+    <boolean name="show_apn_setting_cdma_bool" value="true"/>
+    <boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
+    <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
+    <boolean name="support_downgrade_vt_to_audio_bool" value="false"/>
+    <boolean name="support_pause_ims_video_calls_bool" value="true"/>
+    <boolean name="support_swap_after_merge_bool" value="false"/>
+    <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true"/>
+    <boolean name="use_rcs_presence_bool" value="true"/>
+    <boolean name="video_calls_can_be_hd_audio" value="false"/>
+    <boolean name="voicemail_notification_persistent_bool" value="true"/>
+    <boolean name="wifi_calls_can_be_hd_audio" value="false"/>
+    <boolean name="world_mode_enabled_bool" value="true"/>
+    <int name="aliasMaxChars" value="48"/>
+    <int name="aliasMinChars" value="2"/>
+    <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+    <int name="ims_conference_size_limit_int" value="5"/>
+    <int name="lte_earfcns_rsrp_boost_int" value="6"/>
+    <int name="maxImageHeight" value="1944"/>
+    <int name="maxImageWidth" value="2592"/>
+    <int name="maxMessageSize" value="1258291"/>
+    <int name="maxSubjectLength" value="80"/>
+    <int name="recipientLimit" value="20"/>
+    <int name="smsToMmsTextThreshold" value="7"/>
+    <int name="volte_replacement_rat_int" value="6"/>
+    <int name="wfc_spn_format_idx_int" value="1"/>
+    <string name="carrier_eri_file_name_string">eri_311480.xml</string>
+    <string name="carrier_name_string">Verizon</string>
+    <string name="cdma_home_registered_plmn_name_string">XFINITY Mobile</string>
+    <string name="default_vm_number_string">*86</string>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+    <string name="sim_country_iso_override_string">us</string>
+    <string name="uaProfTagName">Profile</string>
     <string-array name="boosted_lte_earfcns_string_array" num="2">
         <item value="600-1199"/>
         <item value="1950-2399"/>
     </string-array>
-    <boolean name="broadcast_emergency_call_state_changes_bool" value="true"/>
     <string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
         <item value="*71"/>
         <item value="*72"/>
     </string-array>
-    <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
     <string-array name="carrier_data_call_permanent_failure_strings" num="14">
         <item value="OPERATOR_BARRED"/>
         <item value="MISSING_UNKNOWN_APN"/>
@@ -35,8 +94,6 @@
         <item value="UNACCEPTABLE_NETWORK_PARAMETER"/>
         <item value="SIGNAL_LOST"/>
     </string-array>
-    <int name="carrier_default_wfc_ims_mode_int" value="1"/>
-    <string name="carrier_eri_file_name_string" value="eri_311480.xml"/>
     <string-array name="carrier_metered_apn_types_strings" num="3">
         <item value="default"/>
         <item value="dun"/>
@@ -48,39 +105,14 @@
         <item value="mms"/>
         <item value="supl"/>
     </string-array>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="Verizon"/>
-    <boolean name="carrier_promote_wfc_on_call_fail_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_volte_provisioned_bool" value="true"/>
-    <boolean name="carrier_volte_provisioning_required_bool" value="true"/>
-    <boolean name="carrier_vt_available_bool" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-    <boolean name="cdma_home_registered_plmn_name_override_bool" value="true"/>
-    <string name="cdma_home_registered_plmn_name_string" value="XFINITY Mobile"/>
-    <string name="default_vm_number_string" value="*86"/>
     <string-array name="dial_string_replace_string_array" num="2">
         <item value="*611:+19085594899"/>
         <item value="*86:+1MDN"/>
     </string-array>
-    <boolean name="disable_severe_when_extreme_disabled_bool" value="false"/>
-    <boolean name="disable_voice_barring_notification_bool" value="true"/>
-    <boolean name="drop_video_call_when_answering_audio_call_bool" value="true"/>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="editable_wfc_mode_bool" value="false"/>
-    <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="enabledNotifyWapMMSC" value="true"/>
-    <boolean name="enabledTransID" value="true"/>
     <string-array name="filtered_cnap_names_string_array" num="2">
         <item value="WIRELESS CALLER"/>
         <item value="UNKNOWN NAME"/>
     </string-array>
-    <boolean name="gps.persist_lpp_mode_bool" value="true"/>
-    <string name="httpParams" value="x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##"/>
-    <int name="ims_conference_size_limit_int" value="5"/>
     <string-array name="ims_reasoninfo_mapping_string_array" num="10">
         <item value="332|simultaneous call limit has already been reached|1403"/>
         <item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403"/>
@@ -93,38 +125,6 @@
         <item value="1014|call has been pulled by another device|1016"/>
         <item value="*|Call is dropped due to Wi-Fi signal is degraded|1407"/>
     </string-array>
-    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-    <int name="lte_earfcns_rsrp_boost_int" value="6"/>
-    <int-array name="lte_rsrp_thresholds_int_array" num="4">
-        <item value="-115"/>
-        <item value="-105"/>
-        <item value="-95"/>
-        <item value="-85"/>
-    </int-array>
-    <int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11">
-        <item value="64"/>
-        <item value="65"/>
-        <item value="66"/>
-        <item value="76"/>
-        <item value="77"/>
-        <item value="78"/>
-        <item value="79"/>
-        <item value="80"/>
-        <item value="81"/>
-        <item value="82"/>
-        <item value="83"/>
-    </int-array>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1258291"/>
-    <int name="maxSubjectLength" value="80"/>
-    <boolean name="mdn_is_additional_voicemail_number_bool" value="true"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <boolean name="notify_handover_video_from_lte_to_wifi_bool" value="true"/>
-    <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/>
-    <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/>
-    <boolean name="operator_selection_expand_bool" value="true"/>
-    <boolean name="prefer_2g_bool" value="false"/>
     <string-array name="read_only_apn_fields_string_array" num="20">
         <item value="name"/>
         <item value="proxy"/>
@@ -147,23 +147,23 @@
         <item value="mvno_type"/>
         <item value="mvno_match_data"/>
     </string-array>
-    <int name="recipientLimit" value="20"/>
-    <boolean name="rtt_supported_bool" value="true"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <string name="sim_country_iso_override_string" value="us"/>
-    <int name="smsToMmsTextThreshold" value="7"/>
-    <boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
-    <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
-    <boolean name="support_downgrade_vt_to_audio_bool" value="false"/>
-    <boolean name="support_pause_ims_video_calls_bool" value="true"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true"/>
-    <string name="uaProfTagName" value="Profile"/>
-    <boolean name="use_rcs_presence_bool" value="true"/>
-    <boolean name="video_calls_can_be_hd_audio" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <boolean name="wifi_calls_can_be_hd_audio" value="false"/>
-    <boolean name="world_mode_enabled_bool" value="true"/>
+    <int-array name="lte_rsrp_thresholds_int_array" num="4">
+        <item value="-115"/>
+        <item value="-105"/>
+        <item value="-95"/>
+        <item value="-85"/>
+    </int-array>
+    <int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11">
+        <item value="64"/>
+        <item value="65"/>
+        <item value="66"/>
+        <item value="76"/>
+        <item value="77"/>
+        <item value="78"/>
+        <item value="79"/>
+        <item value="80"/>
+        <item value="81"/>
+        <item value="82"/>
+        <item value="83"/>
+    </int-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2093_Tesco.xml b/assets/carrier_config_carrierid_2093_Tesco.xml
index bc68e12..7be753d 100644
--- a/assets/carrier_config_carrierid_2093_Tesco.xml
+++ b/assets/carrier_config_carrierid_2093_Tesco.xml
@@ -4,7 +4,7 @@
     <boolean name="prefer_2g_bool" value="false"/>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string" value="905"/>
+    <string name="default_vm_number_string">905</string>
     <string-array name="non_roaming_operator_string_array" num="8">
         <item value="23420"/>
         <item value="23426"/>
diff --git a/assets/carrier_config_carrierid_20_Vodafone.xml b/assets/carrier_config_carrierid_20_Vodafone.xml
index aaed48e..f9b9272 100644
--- a/assets/carrier_config_carrierid_20_Vodafone.xml
+++ b/assets/carrier_config_carrierid_20_Vodafone.xml
@@ -4,5 +4,5 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="default_vm_number_string" value="+31654501233"/>
+    <string name="default_vm_number_string">+31654501233</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2106_IIJmio.xml b/assets/carrier_config_carrierid_2106_IIJmio.xml
index bf4f219..0af909b 100644
--- a/assets/carrier_config_carrierid_2106_IIJmio.xml
+++ b/assets/carrier_config_carrierid_2106_IIJmio.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="jp"/>
+    <string name="sim_country_iso_override_string">jp</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2118_giffgaff.xml b/assets/carrier_config_carrierid_2118_giffgaff.xml
index 82b8094..ec5e634 100644
--- a/assets/carrier_config_carrierid_2118_giffgaff.xml
+++ b/assets/carrier_config_carrierid_2118_giffgaff.xml
@@ -4,7 +4,7 @@
     <boolean name="prefer_2g_bool" value="false"/>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string" value="443"/>
+    <string name="default_vm_number_string">443</string>
     <string-array name="non_roaming_operator_string_array" num="8">
         <item value="23420"/>
         <item value="23426"/>
diff --git a/assets/carrier_config_carrierid_2124_Iliad.xml b/assets/carrier_config_carrierid_2124_Iliad.xml
index 6140262..c13c835 100644
--- a/assets/carrier_config_carrierid_2124_Iliad.xml
+++ b/assets/carrier_config_carrierid_2124_Iliad.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="it"/>
+    <string name="sim_country_iso_override_string">it</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2127_free_re.xml b/assets/carrier_config_carrierid_2127_free_re.xml
index e378cfb..015ce79 100644
--- a/assets/carrier_config_carrierid_2127_free_re.xml
+++ b/assets/carrier_config_carrierid_2127_free_re.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="re"/>
+    <string name="sim_country_iso_override_string">re</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2130_ALIV_BS.xml b/assets/carrier_config_carrierid_2130_ALIV_BS.xml
index 5a2721e..c839508 100644
--- a/assets/carrier_config_carrierid_2130_ALIV_BS.xml
+++ b/assets/carrier_config_carrierid_2130_ALIV_BS.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="bs"/>
+    <string name="sim_country_iso_override_string">bs</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2135_Coriolis.xml b/assets/carrier_config_carrierid_2135_Coriolis.xml
index 7cd7d2e..6e784bc 100644
--- a/assets/carrier_config_carrierid_2135_Coriolis.xml
+++ b/assets/carrier_config_carrierid_2135_Coriolis.xml
@@ -5,9 +5,9 @@
     <int name="maxMessageSize" value="614400"/>
     <int name="maxImageWidth" value="2592"/>
     <int name="vvm_port_number_int" value="5499"/>
-    <string name="vvm_destination_number_string" value="223"/>
-    <string name="vvm_type_string" value="vvm_type_omtp"/>
-    <string name="sim_country_iso_override_string" value="fr"/>
+    <string name="vvm_destination_number_string">223</string>
+    <string name="vvm_type_string">vvm_type_omtp</string>
+    <string name="sim_country_iso_override_string">fr</string>
     <string-array name="non_roaming_operator_string_array" num="2">
         <item value="20801"/>
         <item value="20810"/>
diff --git a/assets/carrier_config_carrierid_2137_Gamma.xml b/assets/carrier_config_carrierid_2137_Gamma.xml
index 8536761..2a6fc6b 100644
--- a/assets/carrier_config_carrierid_2137_Gamma.xml
+++ b/assets/carrier_config_carrierid_2137_Gamma.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="gb"/>
+    <string name="sim_country_iso_override_string">gb</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2138_jump.xml b/assets/carrier_config_carrierid_2138_jump.xml
index 8536761..2a6fc6b 100644
--- a/assets/carrier_config_carrierid_2138_jump.xml
+++ b/assets/carrier_config_carrierid_2138_jump.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="gb"/>
+    <string name="sim_country_iso_override_string">gb</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2139_sky.xml b/assets/carrier_config_carrierid_2139_sky.xml
index 8536761..2a6fc6b 100644
--- a/assets/carrier_config_carrierid_2139_sky.xml
+++ b/assets/carrier_config_carrierid_2139_sky.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string name="sim_country_iso_override_string" value="gb"/>
+    <string name="sim_country_iso_override_string">gb</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml b/assets/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml
index 9d7b45b..f2b767d 100644
--- a/assets/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml
+++ b/assets/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="YouPhone"/>
+    <string name="carrier_name_string">YouPhone</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2170_Home-Cellular.xml b/assets/carrier_config_carrierid_2170_Home-Cellular.xml
index 0b7b98a..c320f84 100644
--- a/assets/carrier_config_carrierid_2170_Home-Cellular.xml
+++ b/assets/carrier_config_carrierid_2170_Home-Cellular.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="Home Cellular"/>
+    <string name="carrier_name_string">Home Cellular</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2171_Rami-Levy.xml b/assets/carrier_config_carrierid_2171_Rami-Levy.xml
index f4b75d9..62b4178 100644
--- a/assets/carrier_config_carrierid_2171_Rami-Levy.xml
+++ b/assets/carrier_config_carrierid_2171_Rami-Levy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="Rami Levy"/>
+    <string name="carrier_name_string">Rami Levy</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2237_China-Telecom.xml b/assets/carrier_config_carrierid_2237_China-Telecom.xml
index d7a1c2d..1fc05be 100644
--- a/assets/carrier_config_carrierid_2237_China-Telecom.xml
+++ b/assets/carrier_config_carrierid_2237_China-Telecom.xml
@@ -2,5 +2,5 @@
 <carrier_config>
     <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
     <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <string name="sim_country_iso_override_string" value="cn"/>
+    <string name="sim_country_iso_override_string">cn</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2255_NexTech-Wireless.xml b/assets/carrier_config_carrierid_2255_NexTech-Wireless.xml
index e260f62..1fb33c6 100644
--- a/assets/carrier_config_carrierid_2255_NexTech-Wireless.xml
+++ b/assets/carrier_config_carrierid_2255_NexTech-Wireless.xml
@@ -12,6 +12,6 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
-    <string name="emailGatewayNumber" value="6245"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
+    <string name="emailGatewayNumber">6245</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2288_GSC.xml b/assets/carrier_config_carrierid_2288_GSC.xml
index a43a534..2745db4 100644
--- a/assets/carrier_config_carrierid_2288_GSC.xml
+++ b/assets/carrier_config_carrierid_2288_GSC.xml
@@ -9,5 +9,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams" value="X-MDN: ##LINE1##"/>
+    <string name="httpParams">X-MDN: ##LINE1##</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2395_Telekom.xml b/assets/carrier_config_carrierid_2395_Telekom.xml
index 5de2734..59f2bf3 100644
--- a/assets/carrier_config_carrierid_2395_Telekom.xml
+++ b/assets/carrier_config_carrierid_2395_Telekom.xml
@@ -5,6 +5,6 @@
     <boolean name="display_hd_audio_property_bool" value="false"/>
     <boolean name="carrier_name_override_bool" value="true"/>
     <boolean name="auto_retry_failed_wifi_emergency_call" value="true"/>
-    <string name="default_vm_number_string" value="3311"/>
-    <string name="carrier_name_string" value="Telekom"/>
+    <string name="default_vm_number_string">3311</string>
+    <string name="carrier_name_string">Telekom</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_25_Vodafone.xml b/assets/carrier_config_carrierid_25_Vodafone.xml
index e23550e..c38e7be 100644
--- a/assets/carrier_config_carrierid_25_Vodafone.xml
+++ b/assets/carrier_config_carrierid_25_Vodafone.xml
@@ -5,5 +5,5 @@
     <boolean name="carrier_volte_available_bool" value="true"/>
     <boolean name="play_call_recording_tone_bool" value="true"/>
     <int name="volte_replacement_rat_int" value="3"/>
-    <string name="default_vm_number_string" value="5500"/>
+    <string name="default_vm_number_string">5500</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_28_Vodafone.xml b/assets/carrier_config_carrierid_28_Vodafone.xml
index ac74b3c..5e35fa6 100644
--- a/assets/carrier_config_carrierid_28_Vodafone.xml
+++ b/assets/carrier_config_carrierid_28_Vodafone.xml
@@ -2,7 +2,7 @@
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string" value="121"/>
+    <string name="default_vm_number_string">121</string>
     <string-array name="feature_access_codes_string_array" num="3">
         <item value="153"/>
         <item value="132"/>
diff --git a/assets/carrier_config_carrierid_29_Vodafone.xml b/assets/carrier_config_carrierid_29_Vodafone.xml
index f3d88cd..f759437 100644
--- a/assets/carrier_config_carrierid_29_Vodafone.xml
+++ b/assets/carrier_config_carrierid_29_Vodafone.xml
@@ -3,5 +3,5 @@
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <boolean name="carrier_volte_available_bool" value="true"/>
     <int name="volte_replacement_rat_int" value="3"/>
-    <string name="default_vm_number_string" value="42020"/>
+    <string name="default_vm_number_string">42020</string>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_576_Bell-Mobility.xml b/assets/carrier_config_carrierid_576_Bell-Mobility.xml
index 5949040..7b3376c 100644
--- a/assets/carrier_config_carrierid_576_Bell-Mobility.xml
+++ b/assets/carrier_config_carrierid_576_Bell-Mobility.xml
@@ -10,8 +10,8 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="recipientLimit" value="20"/>
     <int name="smsToMmsTextThreshold" value="8"/>
-    <string name="emailGatewayNumber" value="6245"/>
-    <string name="gps.lpp_profile" value="2"/>
+    <string name="emailGatewayNumber">6245</string>
+    <string name="gps.lpp_profile">2</string>
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="302"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml b/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
index 9ba371d..7ef689d 100644
--- a/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
+++ b/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
@@ -3,7 +3,7 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxMessageSize" value="614400"/>
     <int name="maxImageWidth" value="2592"/>
-    <string name="sim_country_iso_override_string" value="ca"/>
+    <string name="sim_country_iso_override_string">ca</string>
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="302"/>
     </string-array>
diff --git a/assets/carrier_config_carrierid_717_Virgin.xml b/assets/carrier_config_carrierid_717_Virgin.xml
index cc2a46d..49f0304 100644
--- a/assets/carrier_config_carrierid_717_Virgin.xml
+++ b/assets/carrier_config_carrierid_717_Virgin.xml
@@ -5,8 +5,8 @@
     <boolean name="prefer_2g_bool" value="false"/>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_name_string" value="Virgin"/>
-    <string name="sim_country_iso_override_string" value="gb"/>
+    <string name="carrier_name_string">Virgin</string>
+    <string name="sim_country_iso_override_string">gb</string>
     <string-array name="non_roaming_operator_string_array" num="6">
         <item value="23430"/>
         <item value="23431"/>
diff --git a/assets/carrier_config_carrierid_718_EE.xml b/assets/carrier_config_carrierid_718_EE.xml
index 298074f..ed7105d 100644
--- a/assets/carrier_config_carrierid_718_EE.xml
+++ b/assets/carrier_config_carrierid_718_EE.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="EE"/>
     <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true"/>
+    <boolean name="prefer_2g_bool" value="false"/>
+    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
+    <int name="wfc_spn_format_idx_int" value="1"/>
+    <string name="carrier_name_string">EE</string>
     <string-array name="non_roaming_operator_string_array" num="6">
         <item value="23430"/>
         <item value="23431"/>
@@ -11,10 +14,7 @@
         <item value="23434"/>
         <item value="23486"/>
     </string-array>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
     <string-array name="wfc_operator_error_codes_string_array" num="1">
         <item value="REG09|0"/>
     </string-array>
-    <int name="wfc_spn_format_idx_int" value="1"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml b/assets/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml
index 2a8d53d..ceebff4 100644
--- a/assets/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml
+++ b/assets/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string" value="Orange-IL"/>
+    <string name="carrier_name_string">Orange-IL</string>
 </carrier_config>