apn: Update Hrvatski Telekom

MCC: 219
MNC: 01, 20

* Take FP4 as baseline
* Add carrier_id and ia type from AOSP
* MVNO "bonbon" should be covered by Hravtski Telekom now, so remove it.

Issue: FP3-A11#360
Change-Id: I8df4964fb1fcd4d41e36e53284461540242da30f
diff --git a/apns-conf.xml b/apns-conf.xml
index bcf1c73..1469756 100644
--- a/apns-conf.xml
+++ b/apns-conf.xml
@@ -1611,49 +1611,43 @@
       type="mms"
   />
 
-  <apn carrier="T-Mobile MMS"
-      mcc="219"
-      mnc="01"
-      apn="mms.htgprs"
-      mmsc="http://mms.t-mobile.hr/servlets/mms"
-      mmsproxy="10.12.0.4"
-      mmsport="8080"
-      type="mms"
-  />
-  <apn carrier="T-Mobile"
-      mcc="219"
-      mnc="01"
-      apn="web.htgprs"
-      type="default,supl"
-  />
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="Internet"
+      carrier_id = "2365"
       mcc="219"
       mnc="01"
       apn="internet.ht.hr"
+      type="default,ia,supl"
+      protocol="IPV4V6"
       authtype="1"
-      type="default,supl"
   />
-  <apn carrier="bonbon Internet"
+
+  <apn carrier="IMS"
+      carrier_id = "2365"
       mcc="219"
       mnc="01"
-      apn="web.htgprs"
-      authtype="1"
-      type="default,supl,agps,fota,dun"
-      mvno_type="spn"
-      mvno_match_data="bonbon"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
+      user_visible="false"
   />
-  <apn carrier="bonbon MMS"
+
+  <apn carrier="HOS"
+      carrier_id = "2365"
       mcc="219"
       mnc="01"
-      apn="mms.htgprs"
-      authtype="1"
-      mmsc="http://mms.bonbon.com.hr/servlets/mms"
+      apn="hos"
+      mmsc="http://mms.t-mobile.hr/servlets/mms"
       mmsproxy="10.12.0.4"
       mmsport="8080"
-      type="mms"
-      mvno_type="spn"
-      mvno_match_data="bonbon"
+      type="mms,xcap"
+      protocol="IPV4V6"
+      authtype="1"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
+      user_visible="false"
+      user_editable="false"
   />
+
   <apn carrier="Tele2"
       mcc="219"
       mnc="02"