Merge "Add APNs for YemenMobile" am: 872cc349f8

Original change: https://android-review.googlesource.com/c/device/sample/+/1490837

Change-Id: If9dfa3c4502879b982530d930556e59528d38f73
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index d60e699..808c36c 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -660,7 +660,7 @@
       mvno_match_data="Rabo Mobiel"
       mvno_type="spn"
   />
- 
+
    <apn carrier="Truphone"
       carrier_id = "2143"
       mcc="204"
@@ -671,7 +671,7 @@
       mvno_type="gid"
       mvno_match_data="547275554B3030656E"
   />
- 
+
    <apn carrier="Truphone"
       carrier_id = "2143"
       mcc="204"
@@ -705,7 +705,6 @@
       mvno_match_data="HOT mobile"
       mvno_type="spn"
   />
-  
 
   <apn carrier="Telfort Internet"
       carrier_id = "1644"
@@ -25782,11 +25781,14 @@
       mmsport="3130"
   />
 
-  <apn carrier="Yemen Mobile"
+  <apn carrier="YemenMobile"
       carrier_id = "2349"
       mcc="421"
       mnc="03"
-      apn="default"
+      apn="ymobile"
+      user="ymobile"
+      password="ymobile"
+      authtype="3"
       type="default,supl"
   />
 
@@ -25798,6 +25800,26 @@
       type="default,supl"
   />
 
+  <apn carrier="YemenMobile"
+      carrier_id = "2349"
+      mcc="421"
+      mnc="11"
+      apn="ymdata"
+      authtype="0"
+      type="default,mms,supl,fota,cbs,dun"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="YemenMobile"
+      carrier_id = "2349"
+      mcc="421"
+      mnc="11"
+      apn="ymims"
+      authtype="0"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="Oman Mobile MMS"
       carrier_id = "970"
       mcc="422"
@@ -28230,7 +28252,7 @@
       protocol="IPV4"
       roaming_protocol="IPV4"
    />
-   
+
   <apn carrier="Optus Yes Internet"
       carrier_id = "30"
       mcc="505"
@@ -28392,7 +28414,7 @@
       protocol="IPV4"
       roaming_protocol="IPV4"
   />
-	
+
   <apn carrier="Telstra IMS"
       carrier_id = "1345"
       mcc="505"