angler/apns: Update USC apn

The bearer_bitmask did not work properly due to duplicate usccinternet
apn

Bug: 64504703
Test: compile

Change-Id: I6dac7e72461bca04130c5033c4290225d34cdd19
(cherry picked from commit 5ecfb9ca9234fa9099ec582c5fb7578b347a735f)
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 72c1eb5..2b3235d 100755
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -12946,6 +12946,20 @@
       bearer_bitmask="6"
   />
 
+  <apn carrier="USCCROAMING"
+      mcc="204"
+      mnc="04"
+      apn="usccinternet"
+      mmsport=""
+      mmsproxy=""
+      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+      mvno_type="spn"
+      mvno_match_data="U.S. Cellular"
+      type="mms,fota,default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="leaco"
       mcc="311"
       mnc="310"
@@ -14109,40 +14123,7 @@
       mmsport="8080"
   />
 
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="580"
-      apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="580"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
-      mtu="1422"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="580"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
-  <!-- bearer 4, 5, 6, 7, 8, 12 -->
+ <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
@@ -14157,25 +14138,15 @@
 
   <apn carrier="U.S. Cellular"
       mcc="311"
-      mnc="581"
-      apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="581"
+      mnc="580"
       apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
   <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
@@ -14184,7 +14155,7 @@
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
 
@@ -14205,35 +14176,13 @@
       mcc="311"
       mnc="582"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="582"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="582"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14251,35 +14200,13 @@
       mcc="311"
       mnc="583"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="583"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="583"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14297,35 +14224,13 @@
       mcc="311"
       mnc="584"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="584"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="584"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14343,35 +14248,13 @@
       mcc="311"
       mnc="585"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="585"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="585"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14389,35 +14272,13 @@
       mcc="311"
       mnc="586"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="586"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="586"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14435,35 +14296,13 @@
       mcc="311"
       mnc="587"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="587"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="587"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14481,35 +14320,13 @@
       mcc="311"
       mnc="588"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="588"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="588"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"
@@ -14527,35 +14344,13 @@
       mcc="311"
       mnc="589"
       apn="usccinternet"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="589"
-      apn="usccinternet"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       type="default,mms,dun,hipri,fota"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      bearer_bitmask="13"
+      bearer_bitmask="13|14"
       mtu="1422"
   />
-
-  <apn carrier="U.S. Cellular"
-      mcc="311"
-      mnc="589"
-      apn="usccinternet"
-      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
-      type="default,mms,dun,hipri,fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      bearer_bitmask="14"
-      mtu="1422"
-  />
-
   <!-- bearer 4, 5, 6, 7, 8, 12 -->
   <apn carrier="U.S. Cellular"
       mcc="311"