Snap for 7362376 from f408a1b4662ba1dda78f2843584cc3b18196cef8 to sc-mainline-release

Change-Id: I016f8f2c8841330d36be7c9e9da6a7e439a816f1
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 624ce98..d132e9e 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -34105,6 +34105,7 @@
       mmsport="80"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="mms"
   />
 
@@ -34117,9 +34118,30 @@
       password="vivo"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="default,supl"
   />
 
+  <apn carrier="Vivo IMS"
+      carrier_id = "530"
+      mcc="724"
+      mnc="06"
+      apn="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="ims"
+  />
+
+  <apn carrier="Vivo Xcap"
+      carrier_id = "530"
+      mcc="724"
+      mnc="06"
+      apn="xcap.ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="xcap"
+  />
+
   <apn carrier="SCTL MMS"
       carrier_id = "1388"
       mcc="724"
@@ -34152,6 +34174,7 @@
       password="vivo"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="default,supl"
   />
 
@@ -34167,9 +34190,30 @@
       mmsport="80"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="mms"
   />
 
+  <apn carrier="Vivo IMS"
+      carrier_id = "530"
+      mcc="724"
+      mnc="10"
+      apn="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="ims"
+  />
+
+  <apn carrier="Vivo Xcap"
+      carrier_id = "530"
+      mcc="724"
+      mnc="10"
+      apn="xcap.ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="xcap"
+  />
+
   <apn carrier="Vivo MMS"
       carrier_id = "530"
       mcc="724"
@@ -34182,6 +34226,7 @@
       mmsport="80"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="mms"
   />
 
@@ -34194,9 +34239,30 @@
       password="vivo"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="default,supl"
   />
 
+  <apn carrier="Vivo IMS"
+      carrier_id = "530"
+      mcc="724"
+      mnc="11"
+      apn="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="ims"
+  />
+
+  <apn carrier="Vivo Xcap"
+      carrier_id = "530"
+      mcc="724"
+      mnc="11"
+      apn="xcap.ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="xcap"
+  />
+
   <apn carrier='Sercomtel:Dados'
       carrier_id = "539"
       mcc='724'
@@ -34341,6 +34407,7 @@
       password="vivo"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="default,supl"
   />
 
@@ -34356,9 +34423,30 @@
       mmsport="80"
       authtype="1"
       protocol="IPV4V6"
+      roaming_protocol="IPV4"
       type="mms"
   />
 
+  <apn carrier="Vivo IMS"
+      carrier_id = "530"
+      mcc="724"
+      mnc="23"
+      apn="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="ims"
+  />
+
+  <apn carrier="Vivo Xcap"
+      carrier_id = "530"
+      mcc="724"
+      mnc="23"
+      apn="xcap.ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
+      type="xcap"
+  />
+
   <apn carrier="OI:INTERNET:2"
       carrier_id = "1389"
       mcc="724"