Snap for 5406228 from d596204e to qt-release

Change-Id: I26386436f2a5d536b7140230d7c09302cb8c11fd

etc/apns-full-conf.xml

@@ -29145,35 +29145,39 @@
   />
   <apn carrier="Default"
+      carrier_id = "2105"
       mcc="530"
       mnc="05"
       apn="wapaccess.co.nz"
       type="default,supl"
-      mvno_match_data="53005204"
-      mvno_type="imsi"
+      mvno_match_data="Skinny"
+      mvno_type="spn"
   />
   <apn carrier="Content"
+      carrier_id = "2105"
       mcc="530"
       mnc="05"
       apn="wapaccess.co.nz"
       proxy="210.55.11.73"
       port="80"
       type="default,supl"
-      mvno_match_data="53005204"
-      mvno_type="imsi"
+      mvno_match_data="Skinny"
+      mvno_type="spn"
   />
   <apn carrier="Data"
+      carrier_id = "2105"
       mcc="530"
       mnc="05"
       apn="wapaccess.co.nz"
       type="default,supl"
-      mvno_match_data="53005204"
-      mvno_type="imsi"
+      mvno_match_data="Skinny"
+      mvno_type="spn"
   />
   <apn carrier="MMS"
+      carrier_id = "2105"
       mcc="530"
       mnc="05"
       apn="wapaccess.co.nz"
@@ -29181,8 +29185,8 @@
       mmsproxy="210.55.11.73"
       mmsport="80"
       type="mms"
-      mvno_match_data="53005204"
-      mvno_type="imsi"
+      mvno_match_data="Skinny"
+      mvno_type="spn"
   />
   <apn carrier="2Degrees Internet"