Change APNs for Tele2 Netherlands mcc204

According to requirements from Tele2 we shall add ims, xcap and
internet APNs for mcc204 mnc16, remove mms for mcc204 mnc02
and add an ims APN.

Test: adb shell content query --uri content://telephony/carriers --where mcc='204'
Bug: 202924232
Change-Id: Idb25c4fb7a4127efe099c7c976c06bf7b3e3572c
[FP3 A11:
 * Drop carrier_id, because it's not present in the carrier_list
 * Reorder/reformat with our tooling]
Issue: FP3-A11#360
(cherry picked from commit 2c7b861cea63493fd8649affa2435c01db37399b)
diff --git a/apns-conf.xml b/apns-conf.xml
index 7b1af6e..5c0c228 100644
--- a/apns-conf.xml
+++ b/apns-conf.xml
@@ -128,15 +128,30 @@
       type="mms"
   />
 
-  <apn carrier="Tele2 GPRS"
+
+  <apn carrier="Tele2 Internet"
       mcc="204"
       mnc="02"
       apn="internet.tele2.nl"
-      mmsc="http://mmsc.tele2.nl"
-      mmsproxy="193.12.40.64"
-      mmsport="8080"
-      type="default,supl,mms"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="4E4C"
   />
+
+  <apn carrier="Tele2 IMS"
+      mcc="204"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="4E4C"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="MVNO NL"
      mcc="204"
      mnc="03"
@@ -491,6 +506,84 @@
       type="ia"
   />
 
+  <apn carrier="Tele2 Internet"
+      carrier_id = "2468"
+      mcc="204"
+      mnc="16"
+      apn="smartsites.t-mobile"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="4e4c"
+  />
+
+  <apn carrier="Tele2 IMS"
+      carrier_id = "2468"
+      mcc="204"
+      mnc="16"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="4e4c"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
+      carrier_id = "2468"
+      mcc="204"
+      mnc="16"
+      apn="hos"
+      user="tmobilemms"
+      password="tmobilemms"
+      type="xcap"
+      protocol="IPV4V6"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="4e4c"
+      user_visible="false"
+  />
+
+  <apn carrier="Tele2 Internet"
+      carrier_id = "2468"
+      mcc="204"
+      mnc="16"
+      apn="smartsites.t-mobile"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="8f"
+  />
+
+  <apn carrier="Tele2 IMS"
+      carrier_id = "2468"
+      mcc="204"
+      mnc="16"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="8f"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
+      carrier_id = "2468"
+      mcc="204"
+      mnc="16"
+      apn="hos"
+      user="tmobilemms"
+      password="tmobilemms"
+      type="xcap"
+      protocol="IPV4V6"
+      authtype="1"
+      mvno_type="gid"
+      mvno_match_data="8f"
+      user_visible="false"
+  />
+
   <apn carrier="Ben Internet Abonnee"
       mcc="204"
       mnc="16"