Snap for 4683893 from e139f004fed17bd33ea4dbc2a9361176ec50bd19 to pi-release

Change-Id: I069af33afe8c897aea7345bed41124141e936e43
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 01ce0ad..01a83c3 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -13,6 +13,7 @@
         <boolean name="allow_adding_apns_bool" value="false" />
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
         <string name="default_vm_number_string">*86</string>
         <int-array name="lte_rsrp_thresholds_int_array" num="4">
@@ -42,6 +43,7 @@
             <item value="SIGNAL_LOST" />
         </string-array>
         <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
         <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
         <boolean name="persist_lpp_mode_bool" value="true" />
         <int name="wfc_spn_format_idx_int" value="1" />
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 0a54a5e..b0e3e19 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -30,6 +30,7 @@
         <boolean name="allow_adding_apns_bool" value="false" />
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
         <string name="default_vm_number_string">*86</string>
         <string-array name="carrier_data_call_permanent_failure_strings" num="14">
@@ -49,6 +50,7 @@
             <item value="SIGNAL_LOST" />
         </string-array>
         <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
         <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
         <boolean name="persist_lpp_mode_bool" value="true" />
         <boolean name="mmsCloseConnection" value="true"/>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index a5b5fec..55f2be0 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -52,6 +52,7 @@
         <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
         <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
         <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
         <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false" />
         <boolean name="wifi_calls_can_be_hd_audio" value="false" />
         <boolean name="video_calls_can_be_hd_audio" value="false" />