Merge tag 'android-13.0.0_r43' into int/13/fp3

Android 13.0.0 release 43

* tag 'android-13.0.0_r43':
  update carrier list for AT&T red pocket

Change-Id: I59b296b31ea0a79fb0eb7f0977bb6a432e6b4d73
diff --git a/assets/latest_carrier_id/carrier_list.pb b/assets/latest_carrier_id/carrier_list.pb
index 7a7c812..1dfa0ff 100644
--- a/assets/latest_carrier_id/carrier_list.pb
+++ b/assets/latest_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/latest_carrier_id/carrier_list.textpb b/assets/latest_carrier_id/carrier_list.textpb
index d80a1ae..c155df7 100644
--- a/assets/latest_carrier_id/carrier_list.textpb
+++ b/assets/latest_carrier_id/carrier_list.textpb
@@ -176,6 +176,7 @@
   carrier_name: "Mkedonski Telecom AD Skopje"
   carrier_attribute {
     mccmnc_tuple: "29401"
+    spn: "T-Mobile MK"
     spn: "Telekom.mk"
     spn: "Telekom MK"
   }
@@ -1101,7 +1102,7 @@
 }
 carrier_id {
   canonical_id: 760
-  carrier_name: "3HK"
+  carrier_name: "3HK/SUPREME"
   carrier_attribute {
     mccmnc_tuple: "45403"
   }
@@ -2466,7 +2467,6 @@
   canonical_id: 1337
   carrier_name: "Movistar"
   carrier_attribute {
-    mccmnc_tuple: "722070"
     mccmnc_tuple: "72207"
   }
 }
@@ -3538,9 +3538,7 @@
   canonical_id: 1492
   carrier_name: "O2"
   carrier_attribute {
-    mccmnc_tuple: "23402"
     mccmnc_tuple: "23410"
-    mccmnc_tuple: "23411"
   }
 }
 carrier_id {
@@ -7410,13 +7408,30 @@
   canonical_id: 2022
   carrier_name: "TracFone"
   carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310260"
     mccmnc_tuple: "310280"
+    mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "DDFF"
+  }
+  carrier_attribute {
+    mccmnc_tuple: "310410"
+    mccmnc_tuple: "310280"
+    mccmnc_tuple: "310240"
+    mccmnc_tuple: "310260"
+    mccmnc_tuple: "311180"
+    mccmnc_tuple: "330110"
     gid1: "DEFF"
   }
   carrier_attribute {
+    mccmnc_tuple: "310260"
+    gid1: "534D"
+  }
+  carrier_attribute {
+    mccmnc_tuple: "310260"
+    gid1: "4D4B"
+  }
+  carrier_attribute {
     mccmnc_tuple: "310590"
     mccmnc_tuple: "310591"
     mccmnc_tuple: "310592"
@@ -7430,18 +7445,16 @@
     mccmnc_tuple: "311480"
     gid1: "BA01270000000000"
   }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "DEFF"
-  }
 }
 carrier_id {
   canonical_id: 2023
   carrier_name: "Consumer Cellular"
   carrier_attribute {
-    mccmnc_tuple: "310410"
     mccmnc_tuple: "310260"
     mccmnc_tuple: "310280"
+    mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "2AC9"
   }
 }
@@ -7460,6 +7473,8 @@
   carrier_attribute {
     mccmnc_tuple: "310280"
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "62FF"
   }
 }
@@ -7467,9 +7482,11 @@
   canonical_id: 2026
   carrier_name: "Red Pocket"
   carrier_attribute {
-    mccmnc_tuple: "310410"
     mccmnc_tuple: "310260"
     mccmnc_tuple: "310280"
+    mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "4201"
   }
 }
@@ -7479,6 +7496,8 @@
   carrier_attribute {
     mccmnc_tuple: "310280"
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "44FF"
   }
 }
@@ -7488,6 +7507,8 @@
   carrier_attribute {
     mccmnc_tuple: "310280"
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "4102"
   }
 }
@@ -7513,6 +7534,8 @@
   carrier_attribute {
     mccmnc_tuple: "310280"
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "310950"
+    mccmnc_tuple: "311180"
     gid1: "69FF"
   }
   carrier_attribute {
@@ -7524,6 +7547,7 @@
   canonical_id: 2032
   carrier_name: "Xfinity Mobile"
   carrier_attribute {
+    mccmnc_tuple: "310590"
     mccmnc_tuple: "310599"
     mccmnc_tuple: "311480"
     mccmnc_tuple: "311481"
@@ -7674,14 +7698,6 @@
   }
 }
 carrier_id {
-  canonical_id: 2063
-  carrier_name: "Family Mobile (Walmart)"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4D4B"
-  }
-}
-carrier_id {
   canonical_id: 2064
   carrier_name: "GoSmart"
   carrier_attribute {
@@ -7787,14 +7803,6 @@
   }
 }
 carrier_id {
-  canonical_id: 2078
-  carrier_name: "Simple Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "534D"
-  }
-}
-carrier_id {
   canonical_id: 2079
   carrier_name: "Solavei"
   carrier_attribute {
@@ -10186,6 +10194,9 @@
     preferred_apn: "lte.ocn.ne.jp"
     preferred_apn: "ocn.ne.jp"
   }
+  carrier_attribute {
+    mccmnc_tuple: "44013"
+  }
 }
 carrier_id {
   canonical_id: 2408
@@ -11221,6 +11232,7 @@
   carrier_name: "Universal DISH - MVNO2"
   carrier_attribute {
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "311180"
     gid1: "3438"
   }
 }
@@ -11229,6 +11241,7 @@
   carrier_name: "Project Genesis - MVNO2"
   carrier_attribute {
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "311180"
     gid1: "3440"
   }
 }
@@ -11336,6 +11349,45 @@
   }
 }
 carrier_id {
+  canonical_id: 2553
+  carrier_name: "4ka SK"
+  carrier_attribute {
+    mccmnc_tuple: "23103"
+  }
+}
+carrier_id {
+  canonical_id: 2554
+  carrier_name: "Cellhire"
+  carrier_attribute {
+    mccmnc_tuple: "20834"
+    spn: "eSIMsmart"
+    spn: "O-Events"
+  }
+}
+carrier_id {
+  canonical_id: 2556
+  carrier_name: "Xfinity Mobile 2.0"
+  carrier_attribute {
+    mccmnc_tuple: "310590"
+    mccmnc_tuple: "310591"
+    mccmnc_tuple: "310599"
+    mccmnc_tuple: "311480"
+    mccmnc_tuple: "311481"
+    mccmnc_tuple: "311482"
+    mccmnc_tuple: "311483"
+    mccmnc_tuple: "311484"
+    mccmnc_tuple: "311485"
+    mccmnc_tuple: "311486"
+    mccmnc_tuple: "311487"
+    mccmnc_tuple: "311488"
+    mccmnc_tuple: "311489"
+    gid1: "BA01640000000000"
+  }
+  carrier_attribute {
+    mccmnc_tuple: "314240"
+  }
+}
+carrier_id {
   canonical_id: 10000
   carrier_name: "Tracfone-ATT"
   carrier_attribute {
@@ -11413,14 +11465,6 @@
   parent_canonical_id: 2053
 }
 carrier_id {
-  canonical_id: 10007
-  carrier_name: "docomo_mvno"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-  }
-  parent_canonical_id: 850
-}
-carrier_id {
   canonical_id: 10008
   carrier_name: "Tracfone-VZW"
   carrier_attribute {
@@ -11471,6 +11515,7 @@
   carrier_name: "Red Pocket-ATT"
   carrier_attribute {
     mccmnc_tuple: "310410"
+    mccmnc_tuple: "310280"
     gid1: "4201"
   }
   parent_canonical_id: 2026
@@ -11673,4 +11718,4 @@
   }
   parent_canonical_id: 2531
 }
-version: 67108884
+version: 67108885