Merge cherrypicks of ['googleplex-android-review.googlesource.com/32878876'] into 25Q2-release.

Change-Id: Iea7836478de37df0ed2f95dc6cf8579adc5ee39c

tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java

diff --git a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java
index fc2ba76..0ffba14 100644
--- a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java
+++ b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java
@@ -29,7 +29,6 @@
         apps.put("com.ludo.king", "ludo_king");
         apps.put("com.mojang.minecraftpe", "minecraft_bedrock");
         apps.put("com.my.defense", "rush_royale");
-        apps.put("com.nianticlabs.pokemongo", "pokemon_go");
         apps.put("com.nintendo.zaka", "mario_kart_tour");
         apps.put("com.os.airforce", "1945_air_force");
         apps.put("com.playrix.fishdomdd.gplay", "fishdom");

tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java

diff --git a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java
index 5015921..3b6c028 100644
--- a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java
+++ b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java
@@ -607,6 +607,7 @@
             // Launch angle_trace_tests app with --list-test argument to get the list of trace names
             List<String> traceNames = runAngleListTrace(mTestHelper, gtestStdoutFile);
 
+            // Verify the traces in angle_traces package contains all required ANGLE allowlist apps
             verifyTraceList(traceNames);
 
             // Delete angle_debug_package global settings so that when trace is set to run
@@ -614,8 +615,8 @@
             mTestHelper.adbShellCommandCheck(mTestHelper.WAIT_SET_GLOBAL_SETTING_MILLIS,
                     "settings delete global angle_debug_package");
 
-            // Run all the trace tests.
-            for (final String traceName : traceNames) {
+            // Run all the trace test of apps required on ANGLE allowlist.
+            for (final String traceName : AngleAllowlist.apps.values()) {
                 // push the "<traceName>.json" onto the device
                 String traceJsonFileName = String.format("%s.json", traceName);
                 final File traceJsonFile = mTestHelper.path(angleTraceTestPackage, "src", "tests",
@@ -653,7 +654,7 @@
             // Check all required traces completed successfully
             assertTrue(String.format("Not all required traces are ran, traces that are skipped: %s",
                                mSkippedTrace.toString()),
-                    mTracePerfANGLEFPS.size() == traceNames.size());
+                    mTracePerfANGLEFPS.size() == AngleAllowlist.apps.size());
 
             // Check trace test result
             Set<String> failedTraceList = new HashSet<String>();