Merge "Merge 24Q3 to AOSP main" into main
diff --git a/input_data/android/telephonylookup.txt b/input_data/android/telephonylookup.txt
index a88802e..9e73e14 100644
--- a/input_data/android/telephonylookup.txt
+++ b/input_data/android/telephonylookup.txt
@@ -58,3 +58,10 @@
   countryIsoCode: "gu"
 >
 
+networks:<
+  # American Samoa Telecommunications ASTCA  http://b/328151581
+  mcc: "311"
+  mnc: "780"
+  countryIsoCode: "as"
+>
+
diff --git a/output_data/android/telephonylookup.xml b/output_data/android/telephonylookup.xml
index 34808ea..17a7e9c 100644
--- a/output_data/android/telephonylookup.xml
+++ b/output_data/android/telephonylookup.xml
@@ -6,5 +6,6 @@
  <networks>
   <network mcc="310" mnc="370" country="gu"/>
   <network mcc="310" mnc="470" country="gu"/>
+  <network mcc="311" mnc="780" country="as"/>
  </networks>
 </telephony_lookup>
diff --git a/testing/data/test1/output_data/android/telephonylookup.xml b/testing/data/test1/output_data/android/telephonylookup.xml
index 34808ea..17a7e9c 100644
--- a/testing/data/test1/output_data/android/telephonylookup.xml
+++ b/testing/data/test1/output_data/android/telephonylookup.xml
@@ -6,5 +6,6 @@
  <networks>
   <network mcc="310" mnc="370" country="gu"/>
   <network mcc="310" mnc="470" country="gu"/>
+  <network mcc="311" mnc="780" country="as"/>
  </networks>
 </telephony_lookup>
diff --git a/testing/data/test3/output_data/android/telephonylookup.xml b/testing/data/test3/output_data/android/telephonylookup.xml
index 34808ea..17a7e9c 100644
--- a/testing/data/test3/output_data/android/telephonylookup.xml
+++ b/testing/data/test3/output_data/android/telephonylookup.xml
@@ -6,5 +6,6 @@
  <networks>
   <network mcc="310" mnc="370" country="gu"/>
   <network mcc="310" mnc="470" country="gu"/>
+  <network mcc="311" mnc="780" country="as"/>
  </networks>
 </telephony_lookup>