DO NOT MERGE Keep APNs same as M for Canada carriers.

Revert "apn update sync"
This reverts commit d2d05dd5bf56e0b3136cbe733da14a479104cda3.

Revert "Add Telus and Koodo apns."
This reverts commit 0e7675677e95125c9b9ab18b149945a7ea772a57.

Bug: 34373078
Change-Id: I7ad04a455929336be5177f5d80c9c1e105e3664c
(cherry picked from commit ea21b82a701b7aa81eb62997fcf490db7b763793)
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
old mode 100644
new mode 100755
index c40cdd7..6d33d48
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -6042,15 +6042,6 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="O2 DE IMS"
-      mcc="262"
-      mnc="07"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="o2 Internet Prepaid"
       mcc="262"
       mnc="07"
@@ -6111,15 +6102,6 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="O2 DE IMS"
-      mcc="262"
-      mnc="08"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="Truphone"
       mcc="262"
       mnc="42"
@@ -6828,49 +6810,6 @@
       mvno_type="gid"
   />
 
-  <apn carrier="TELUS"
-      mcc="302"
-      mnc="220"
-      apn="sp.telus.com"
-      type="default,mms,supl"
-      mmsc="http://aliasredirect.net/proxy/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS Tether"
-      mcc="302"
-      mnc="220"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="54"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS Tether"
-      mcc="302"
-      mnc="220"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS IMS"
-      mcc="302"
-      mnc="220"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="Koodo"
       mcc="302"
       mnc="220"
@@ -6883,40 +6822,6 @@
       mvno_type="gid"
   />
 
-  <apn carrier="Koodo"
-      mcc="302"
-      mnc="220"
-      apn="sp.koodo.com"
-      type="default,mms,supl"
-      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="4F"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo Tether"
-      mcc="302"
-      mnc="220"
-      apn="sp.koodo.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="4B"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo Tether"
-      mcc="302"
-      mnc="220"
-      apn="sp.koodo.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="4F"
-      mvno_type="gid"
-  />
-
   <apn carrier="Mobile Internet"
       mcc="302"
       mnc="220"
@@ -6980,49 +6885,6 @@
       mvno_type="gid"
   />
 
-  <apn carrier="TELUS"
-      mcc="302"
-      mnc="221"
-      apn="sp.telus.com"
-      type="default,mms,supl"
-      mmsc="http://aliasredirect.net/proxy/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS Tether"
-      mcc="302"
-      mnc="221"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="54"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS Tether"
-      mcc="302"
-      mnc="221"
-      apn="isp.telus.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="55"
-      mvno_type="gid"
-  />
-
-  <apn carrier="TELUS IMS"
-      mcc="302"
-      mnc="221"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="Koodo"
       mcc="302"
       mnc="221"
@@ -7035,40 +6897,6 @@
       mvno_type="gid"
   />
 
-  <apn carrier="Koodo"
-      mcc="302"
-      mnc="221"
-      apn="sp.koodo.com"
-      type="default,mms,supl"
-      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_match_data="4F"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo Tether"
-      mcc="302"
-      mnc="221"
-      apn="sp.koodo.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="4B"
-      mvno_type="gid"
-  />
-
-  <apn carrier="Koodo Tether"
-      mcc="302"
-      mnc="221"
-      apn="sp.koodo.com"
-      server="*"
-      type="dun"
-      protocol="IPV4V6"
-      mvno_match_data="4F"
-      mvno_type="gid"
-  />
-
   <apn carrier="PC mobile"
       mcc="302"
       mnc="221"
@@ -7117,15 +6945,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Rogers IMS"
-      mcc="302"
-      mnc="370"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="Fido Tethering"
       mcc="302"
       mnc="370"
@@ -7151,17 +6970,6 @@
       roaming_protocol="IP"
   />
 
-  <apn carrier="Fido Internet"
-      mcc="302"
-      mnc="370"
-      apn="IMS"
-      type="ims"
-      mvno_match_data="DD"
-      mvno_type="gid"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="MTS"
       mcc="302"
       mnc="370"
@@ -7237,15 +7045,6 @@
       mmsc="http://mms.bell.ca/mms/wapenc"
   />
 
-  <apn carrier="Bell Mobility IMS"
-      mcc="302"
-      mnc="610"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="MTS"
       mcc="302"
       mnc="660"
@@ -7271,27 +7070,6 @@
       mvno_match_data="MTS"
   />
 
-  <apn carrier="Rogers LTE"
-      mcc="302"
-      mnc="720"
-      apn="ltemobile.apn"
-      type="default,mms,supl"
-      mmsproxy="mmsproxy.rogers.com"
-      mmsc="http://mms.gprs.rogers.com"
-      mmsport="80"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="Rogers IMS"
-      mcc="302"
-      mnc="720"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="chatr"
       mcc="302"
       mnc="720"
@@ -26374,15 +26152,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telstra IMS"
-      mcc="505"
-      mnc="01"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="Telstra Internet"
       mcc="505"
       mnc="01"