Signed-off-by: Tiago <tiago.vaz@truphone.com>

New IMSI added and for those where a sub-range is used, matching criteria changed to GID
Test: unable to test via  apns-full-conf.xml since this file won't take efect in newer Android versions. Tested instead by inserting the APN's into de UE DB.

Issue reported @ https://issuetracker.google.com/issues/136131644

Change-Id: Ie8f583360d13b6169dd1016cbc2c0d3d6f8dce44
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index d6a6d7c..b947997 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -404,8 +404,19 @@
       apn="truphone.com"
       mmsc="http://mmsc.truphone.com:1981/mm1"
       type="default,supl,mms,dun"
-      mvno_match_data="204043914"
-      mvno_type="imsi"
+      mvno_type="gid"
+      mvno_match_data="547275554B3030656E"
+  />
+
+  <apn carrier="Truphone"
+      carrier_id = "2143"
+      mcc="204"
+      mnc="04"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+      mvno_type="gid"
+      mvno_match_data="54727555533030656E"
   />
 
   <apn carrier="Vodafone NL"
@@ -659,6 +670,28 @@
       mvno_match_data="Rabo Mobiel"
       mvno_type="spn"
   />
+ 
+   <apn carrier="Truphone"
+      carrier_id = "2143"
+      mcc="204"
+      mnc="08"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+      mvno_type="gid"
+      mvno_match_data="547275554B3030656E"
+  />
+ 
+   <apn carrier="Truphone"
+      carrier_id = "2143"
+      mcc="204"
+      mnc="08"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+      mvno_type="gid"
+      mvno_match_data="54727555533030656E"
+  />
 
   <apn carrier="HOT mobile Internet"
       carrier_id = "1991"
@@ -682,6 +715,7 @@
       mvno_match_data="HOT mobile"
       mvno_type="spn"
   />
+  
 
   <apn carrier="Telfort Internet"
       carrier_id = "1644"
@@ -1157,8 +1191,19 @@
       apn="truphone.com"
       mmsc="http://mmsc.truphone.com:1981/mm1"
       type="default,supl,mms,dun"
-      mvno_match_data="208090022"
-      mvno_type="imsi"
+      mvno_type="gid"
+      mvno_match_data="547275554B3030656E"
+  />
+
+  <apn carrier="Truphone"
+      carrier_id = "2143"
+      mcc="208"
+      mnc="09"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+	  mvno_type="gid"
+      mvno_match_data="54727555533030656E"
   />
 
   <apn carrier="Coriolis"
@@ -11573,8 +11618,19 @@
       apn="truphone.com"
       mmsc="http://mmsc.truphone.com:1981/mm1"
       type="default,supl,mms,dun"
-      mvno_match_data="310690601"
-      mvno_type="imsi"
+      mvno_type="gid"
+      mvno_match_data="547275554B3030656E"
+  />
+
+  <apn carrier="Truphone"
+      carrier_id = "2143"
+      mcc="310"
+      mnc="69"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+	  mvno_type="gid"
+      mvno_match_data="54727555533030656E"
   />
 
   <apn carrier="Limitless"
@@ -28370,17 +28426,6 @@
       type="mms"
   />
 
-  <apn carrier="Truphone"
-      carrier_id = "2143"
-      mcc="505"
-      mnc="02"
-      apn="truphone.com"
-      mmsc="http://mmsc.truphone.com:1981/mm1"
-      type="default,supl,mms,dun"
-      mvno_match_data="50502100"
-      mvno_type="imsi"
-  />
-
   <apn carrier="Virgin Internet"
       carrier_id = "2145"
       mcc="505"