angler: The wrong IA apn was set to modem side in USCC network

--Move the APN used for CDMA back to the APN used for eHRPD/LTE

BUG=24510736

Change-Id: Ib22b48d0eb2a95b506d63974aef405b3a26d3dfc
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 49a0727..7679b4f 100755
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -12350,18 +12350,6 @@
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      authtype="3"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="6"
-      mtu="1422"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="220"
       apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
@@ -12419,19 +12407,6 @@
       mtu="1422"
   />
 
-  <!-- bearer 4, 5, 6, 7, 8, 12 -->
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="221"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      authtype="3"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="4|5|6|7|8|12"
-      mtu="1422"
-  />
-
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
@@ -12456,6 +12431,19 @@
       mtu="1422"
   />
 
+  <!-- bearer 4, 5, 6, 7, 8, 12 -->
+  <apn carrier="U.S. Cellular"
+      mcc="311"
+      mnc="221"
+      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+      type="default,mms,dun,hipri,fota"
+      authtype="3"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer_bitmask="4|5|6|7|8|12"
+      mtu="1422"
+  />
+
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
@@ -12567,18 +12555,6 @@
       mtu="1422"
   />
 
-  <!-- bearer 4, 5, 6, 7, 8, 12 -->
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="225"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      authtype="3"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="4|5|6|7|8|12"
-      mtu="1422"
-  />
 
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -12606,6 +12582,19 @@
       mtu="1422"
   />
 
+  <!-- bearer 4, 5, 6, 7, 8, 12 -->
+  <apn carrier="U.S. Cellular"
+      mcc="311"
+      mnc="225"
+      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+      type="default,mms,dun,hipri,fota"
+      authtype="3"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer_bitmask="4|5|6|7|8|12"
+      mtu="1422"
+  />
+
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
@@ -14031,19 +14020,6 @@
       mmsport="8080"
   />
 
-  <!-- bearer 4, 5, 6, 7, 8, 12 -->
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="580"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      authtype="3"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="4|5|6|7|8|12"
-      mtu="1422"
-  />
-
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
@@ -14068,6 +14044,19 @@
       mtu="1422"
   />
 
+  <!-- bearer 4, 5, 6, 7, 8, 12 -->
+  <apn carrier="U.S. Cellular"
+      mcc="311"
+      mnc="580"
+      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+      type="default,mms,dun,hipri,fota"
+      authtype="3"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer_bitmask="4|5|6|7|8|12"
+      mtu="1422"
+  />
+
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"