Merge QP1A.190324.001

Change-Id: I9d4ed01c4d77abb4abbf998faf5601e3bdadc75e

etc/README

+===== apns-full-conf.xml =====
+
+This file contains apn configurations and serves as a sample file.
+A typical APN config looks like this:
+<apn carrier="CarrierXYZ"
+      carrier_id="1"
+      mcc="123"
+      mnc="123"
+      apn="carrierxyz"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.carrierxyz.com"
+      mmsproxy="0.0.0.0"
+      mmsport="80"
+      bearer_bitmask="4|5|6|7|8|12"
+/>
+
+For APNs with a matching carrier ID please assign a carrier ID
+AOSP carrier ID assignments can be found at
+https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/carrier_list.textpb
\ No newline at end of file

etc/apns-full-conf.xml

@@ -1951,6 +1951,20 @@
       mmsport="8080"
   />
+  <apn carrier="INET Roaming"
+      mcc="214"
+      mnc="05"
+      apn="inet.es"
+      user=""
+      password=""
+      port=""
+      proxy=""
+      type="default,supl,foat,hipri"
+      roaming_protocol="IPV4V6"
+      mvno_type="imsi"
+      mvno_match_data="214050104xxxxxx"
+  />
+
   <apn carrier="INTERNET GPRS"
       carrier_id = "1909"
       mcc="214"
@@ -2342,6 +2356,18 @@
       mvno_match_data="Tuenti"
   />
+  <apn carrier="INET Internet"
+      mcc="214"
+      mnc="34"
+      apn="inet.es"
+      user=""
+      password=""
+      port=""
+      proxy=""
+      type="default,supl,foat,hipri"
+      protocol="IPV4V6"
+  />
+
   <apn carrier="Telenor MMS"
       carrier_id = "1534"
       mcc="216"
@@ -3089,6 +3115,17 @@
       type="default,supl,mms"
   />
+  <apn carrier="Plintron"
+      mcc="222"
+      mnc="54"
+      apn="data.plintron.it"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Plintron"
+  />
+
   <apn carrier="WIND WEB"
       carrier_id = "1573"
       mcc="222"
@@ -3696,6 +3733,17 @@
       type="default,supl"
   />
+  <apn carrier="Plintron"
+      mcc="232"
+      mnc="22"
+      apn="data.plintron.at"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Plintron"
+  />
+
   <apn carrier="UBIQUISYS"
       carrier_id = "1491"
       mcc="234"
@@ -32943,6 +32991,17 @@
       type="mms"
   />
+  <apn carrier="Surf"
+      mcc="724"
+      mnc="17"
+      apn="internet.br"
+      authtype="1"
+      user=""
+      password=""
+      mvno_type="spn"
+      mvno_match_data="Surf"
+  />
+
   <apn carrier="TelemigC GPRS"
       carrier_id = "543"
       mcc="724"