apn: Update EE mnc33 for Your Co-OP

mcc: 234
mnc: 33

Update EE APNs on MNC 33 only, skip 30, 08 (MNVO only) and removal of
deprecated ones for now. Fixing up the mnc33 that's used for Your Co-OP
us more urgent, the other will receive an update after more testing.

Use FP4 as baseline, add APN type 'ia' as per AOSP, update protocols as
per requirements. Skip updated/added entries for MNVOs for now (BT).

Issue: FP3-A11#348
Change-Id: Ia2c01f4e5a14984d46a6d936f7d33b5a6163b878
diff --git a/apns-conf.xml b/apns-conf.xml
index 4c15818..9450914 100644
--- a/apns-conf.xml
+++ b/apns-conf.xml
@@ -3438,33 +3438,61 @@
       authtype="1"
       type="mms"
   />
+
   <apn carrier="Internet"
       mcc="234"
       mnc="33"
       apn="everywhere"
+      spn="EE"
       user="eesecure"
       password="secure"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       authtype="1"
-      protocol="IP"
-      roaming_protocol="IP"
-      type="default"
-      user_editable="0"
+      user_editable="false"
   />
+
+  <apn carrier="IMS"
+      mcc="234"
+      mnc="33"
+      apn="ims"
+      type="ims"
+      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="MMS"
       mcc="234"
       mnc="33"
       apn="eezone"
+      spn="EE"
       user="eesecure"
       password="secure"
       mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
-      authtype="1"
       type="mms"
-      protocol="IP"
-      roaming_protocol="IP"
-      user_editable="0"
+      authtype="1"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18"
+      user_editable="false"
   />
+
+  <apn carrier="xcap"
+      mcc="234"
+      mnc="33"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      type="xcap"
+      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"
+  />
+
   <apn carrier="EE Internet"
       mcc="234"
       mnc="34"