Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config. am: fcdc2066de
am: a0942410e7

Change-Id: I4c228fd7c3b18f7a60e237f9f38e017746eab1f5
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index a5745b4..ef18d8b 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -65,9 +65,10 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+        <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
             <item value="default" />
             <item value="dun" />
+            <item value="mms" />
             <item value="supl" />
         </string-array>
         <boolean name="disable_voice_barring_notification_bool" value="true" />
diff --git a/assets/carrier_config_302370.xml b/assets/carrier_config_302370.xml
index b416653..bbe05af 100644
--- a/assets/carrier_config_302370.xml
+++ b/assets/carrier_config_302370.xml
@@ -7,6 +7,7 @@
         <int name="maxSubjectLength" value="80"/>
         <int name="maxMessageSize" value="1048576"/>
         <int name="maxImageWidth" value="2592"/>
+        <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true" />
         <string-array name="read_only_apn_types_string_array" num="1">
             <item value="*"/>
         </string-array>
diff --git a/assets/carrier_config_302720.xml b/assets/carrier_config_302720.xml
index a97c049..99eb0a8 100644
--- a/assets/carrier_config_302720.xml
+++ b/assets/carrier_config_302720.xml
@@ -8,6 +8,7 @@
         <int name="maxMessageSize" value="1048576" />
         <int name="maxImageWidth" value="2592" />
         <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true" />
         <string-array name="read_only_apn_types_string_array" num="1">
             <item value="*" />
         </string-array>
@@ -19,4 +20,4 @@
             <item value="302780" />
         </string-array>
     </carrier_config>
-</carrier_config_list>
+</carrier_config_list>
\ No newline at end of file
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 9eaa84f..a2a4052 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -79,9 +79,10 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+        <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
             <item value="default" />
             <item value="dun" />
+            <item value="mms" />
             <item value="supl" />
         </string-array>
         <boolean name="disable_voice_barring_notification_bool" value="true" />
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index e5a92f9..d051b47 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -123,9 +123,10 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+        <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
             <item value="default" />
             <item value="dun" />
+            <item value="mms" />
             <item value="supl" />
         </string-array>
         <boolean name="is_ims_conference_size_enforced_bool" value="true"/>