Merge "vendor: add sm8150/msmnile to qcom targets" into android-9.0
diff --git a/prebuilt/etc/apns-conf.xml b/prebuilt/etc/apns-conf.xml
index d01547e..986f741 100644
--- a/prebuilt/etc/apns-conf.xml
+++ b/prebuilt/etc/apns-conf.xml
@@ -14350,92 +14350,51 @@
   roaming_protocol="IP"
  />
 
-  <apn carrier="cellcom"
-      mcc="310"
-      mnc="600"
-      apn="CdmaNai"
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      mmsc="http://mms.cellcom.com/cellcom/mms.php"
-      mmsproxy=""
-      mmsport=""
-      type="mms"
-      carrier_enabled="false"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="6"
+    <apn carrier="Cellcom FOTA"
+       mcc="310"
+       mnc="600"
+       apn="VZWADMIN"
+       type="fota"
+       bearer_bitmask="13|14"
+       max_conns="20"
+       max_conns_time="300"
+       mvno_type="gid"
+       mvno_match_data="BA00040000000000"
+       protocol="IPV4V6"
+       roaming_protocol="IPV4V6"
+       profile_id="3"
+       mtu="1428"
   />
   <apn carrier="Cellcom IMS"
-      mcc="310"
-      mnc="600"
-      apn="IMS"
-      type="ims,ia"
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-  />
-  <apn carrier="Cellcom IMS"
-      mcc="310"
-      mnc="600"
-      apn="IMS"
-      type="ims,ia"
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
-  />
-  <apn carrier="Cellcom FOTA"
-      mcc="310"
-      mnc="600"
-      apn="VZWADMIN"
-      type="fota"
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-  />
-  <apn carrier="Cellcom FOTA"
-      mcc="310"
-      mnc="600"
-      apn="VZWADMIN"
-      type="fota"
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
+       mcc="310"
+       mnc="600"
+       apn="VZWIMS"
+       type="ims,ia"
+       bearer_bitmask="13|14"
+       max_conns="20"
+       max_conns_time="300"
+       mvno_type="gid"
+       mvno_match_data="BA00040000000000"
+       protocol="IPV4V6"
+       roaming_protocol="IPV4V6"
+       profile_id="2"
+       mtu="1428"
   />
   <apn carrier="Cellcom"
-      mcc="310"
-      mnc="600"
-      apn="VZWINTERNET"
-      mmsc="http://mms.cellcom.com/cellcom/mms.php"
-      mmsproxy=""
-      mmsport=""
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      type="default,mms,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="13"
-  />
-  <apn carrier="Cellcom"
-      mcc="310"
-      mnc="600"
-      apn="VZWINTERNET"
-      mmsc="http://mms.cellcom.com/cellcom/mms.php"
-      mmsproxy=""
-      mmsport=""
-      mvno_type="spn"
-      mvno_match_data="cellcom"
-      type="default,mms,dun,supl"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer="14"
+       mcc="310"
+       mnc="600"
+       apn="VZWINTERNET"
+       type="default,mms,dun,supl"
+       bearer_bitmask="13|14"
+       max_conns="20"
+       max_conns_time="300"
+       mvno_type="gid"
+       mvno_match_data="BA00040000000000"
+       protocol="IPV4V6"
+       roaming_protocol="IPV4V6"
+       mmsc="http://mms.cellcom.com/cellcom/mms.php"
+       profile_id="0"
+       mtu="1428"
   />
   <apn carrier="EpicINT"
       mcc="310"