Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
diff --git a/assets/carrier_config_23415.xml b/assets/carrier_config_23415.xml
index badfc31..24b7fd8 100644
--- a/assets/carrier_config_23415.xml
+++ b/assets/carrier_config_23415.xml
@@ -6,5 +6,10 @@
         <string-array name="read_only_apn_types_string_array" num="1">
             <item value="*" />
         </string-array>
+        <string-array name="feature_access_codes_string_array" num="3">
+            <item value="153" />
+            <item value="132" />
+            <item value="45" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23430.xml b/assets/carrier_config_23430.xml
index 5345c97..2c24c59 100644
--- a/assets/carrier_config_23430.xml
+++ b/assets/carrier_config_23430.xml
@@ -12,6 +12,7 @@
             <item value="23434" />
             <item value="23486" />
         </string-array>
+        <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true" />
     </carrier_config>
     <carrier_config gid1="28000000">
         <boolean name="carrier_name_override_bool" value="true" />
diff --git a/assets/carrier_config_23433.xml b/assets/carrier_config_23433.xml
index 5345c97..2c24c59 100644
--- a/assets/carrier_config_23433.xml
+++ b/assets/carrier_config_23433.xml
@@ -12,6 +12,7 @@
             <item value="23434" />
             <item value="23486" />
         </string-array>
+        <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true" />
     </carrier_config>
     <carrier_config gid1="28000000">
         <boolean name="carrier_name_override_bool" value="true" />