Snap for 8730993 from 67ec4a4b6c8068046da65d2b6cddcdfb710fdaa6 to mainline-tzdata3-release

Change-Id: I1199c2124e2afb5fd471dbd6fb5fc6ed9a801d5d
diff --git a/tools/build/config.mk b/tools/build/config.mk
index 3eef5b5..0849379 100644
--- a/tools/build/config.mk
+++ b/tools/build/config.mk
@@ -18,12 +18,10 @@
 mts_modules :=
 mts_modules += \
                adbd \
-               adservices \
-               appsearch \
                art \
-               bluetooth \
                cellbroadcast \
                conscrypt \
+               cronet \
                dnsresolver \
                documentsui \
                extservices \
@@ -33,14 +31,12 @@
                mediaprovider \
                networking \
                neuralnetworks \
-               ondevicepersonalization \
                permission \
                scheduling \
                sdkextensions \
                statsd \
                tethering \
                tzdata \
-               uwb \
                wifi
 
 $(foreach module, $(mts_modules), \
diff --git a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
deleted file mode 100644
index 34ae58a..0000000
--- a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<configuration description="List test modules of AdServices module. This is a placeholder xml instead of a runnable plan.">
-    <option name="compatibility:include-filter"
-            value="CtsAdServicesDeviceTestCases" />
-    <option name="compatibility:include-filter"
-            value="CtsAdServicesEndToEndTests" />
-    <option name="compatibility:include-filter"
-            value="AdServicesFrameworkUnitTests" />
-    <option name="compatibility:include-filter"
-            value="AdServicesServiceCoreUnitTests" />
-
-    <option name="compatibility:include-filter"
-            value="SdkSandboxManagerTests" />
-    <option name="compatibility:include-filter"
-            value="CtsSdkSandboxInprocessTests" />
-    <option name="compatibility:include-filter"
-            value="SdkSandboxManagerServiceUnitTests" />
-    <option name="compatibility:include-filter"
-            value="SdkSandboxTests" />
-
-    <option name="compatibility:module-arg" value="CtsAdServicesDeviceTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="CtsAdServicesEndToEndTests:enable:true" />
-    <option name="compatibility:module-arg" value="AdServicesFrameworkUnitTests:enable:true" />
-    <option name="compatibility:module-arg" value="AdServicesServiceCoreUnitTests:enable:true" />
-
-    <option name="compatibility:module-arg" value="SdkSandboxManagerTests:enable:true" />
-    <option name="compatibility:module-arg" value="CtsSdkSandboxInprocessTests:enable:true" />
-    <option name="compatibility:module-arg" value="SdkSandboxManagerServiceUnitTests:enable:true" />
-    <option name="compatibility:module-arg" value="SdkSandboxTests:enable:true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-appsearch-tests-list.xml b/tools/mts-tradefed/res/config/mts-appsearch-tests-list.xml
deleted file mode 100644
index 16b50ef..0000000
--- a/tools/mts-tradefed/res/config/mts-appsearch-tests-list.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<configuration description="List test modules of APPSEARCH module. This is a placeholder xml instead of a runnable plan.">
-    <option name="compatibility:include-filter" value="AppSearchCoreTests" />
-    <option name="compatibility:include-filter" value="AppSearchServicesTests" />
-    <option name="compatibility:include-filter" value="AppSearchMockingServicesTests" />
-    <option name="compatibility:include-filter" value="ContactsIndexerTests" />
-    <option name="compatibility:include-filter" value="CtsAppSearchTestCases" />
-    <option name="compatibility:include-filter" value="CtsAppSearchHostTestCases" />
-
-    <option name="compatibility:module-arg" value="AppSearchCoreTests:enable:true" />
-    <option name="compatibility:module-arg" value="AppSearchServicesTests:enable:true" />
-    <option name="compatibility:module-arg" value="AppSearchMockingServicesTests:enable:true" />
-    <option name="compatibility:module-arg" value="ContactsIndexerTests:enable:true" />
-    <option name="compatibility:module-arg" value="CtsAppSearchTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="CtsAppSearchHostTestCases:enable:true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-appsearch.xml b/tools/mts-tradefed/res/config/mts-appsearch.xml
deleted file mode 100644
index bf006a1..0000000
--- a/tools/mts-tradefed/res/config/mts-appsearch.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<configuration description="Runs MTS-appsearch from a pre-existing MTS installation">
-
-    <include name="mts" />
-
-    <include name="mts-appsearch-tests-list" />
-
-    <option name="plan" value="mts-appsearch" />
-
-    <option name="compatibility:primary-abi-only" value="true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
index 72c1f6c..96b133b 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
@@ -21,7 +21,6 @@
     <option name="compatibility:include-filter" value="art-run-test-001-Main"/>
     <option name="compatibility:include-filter" value="art-run-test-002-sleep"/>
     <option name="compatibility:include-filter" value="art-run-test-004-InterfaceTest"/>
-    <option name="compatibility:include-filter" value="art-run-test-004-NativeAllocations"/>
     <option name="compatibility:include-filter" value="art-run-test-004-checker-UnsafeTest18"/>
     <option name="compatibility:include-filter" value="art-run-test-006-args"/>
     <option name="compatibility:include-filter" value="art-run-test-007-count10"/>
@@ -86,11 +85,8 @@
     <option name="compatibility:include-filter" value="art-run-test-093-serialization"/>
     <option name="compatibility:include-filter" value="art-run-test-094-pattern"/>
     <option name="compatibility:include-filter" value="art-run-test-095-switch-MAX_INT"/>
-    <option name="compatibility:include-filter" value="art-run-test-096-array-copy-concurrent-gc"/>
     <option name="compatibility:include-filter" value="art-run-test-099-vmdebug"/>
     <option name="compatibility:include-filter" value="art-run-test-100-reflect2"/>
-    <option name="compatibility:include-filter" value="art-run-test-1000-non-moving-space-stress"/>
-    <option name="compatibility:include-filter" value="art-run-test-1004-checker-volatile-ref-load"/>
     <option name="compatibility:include-filter" value="art-run-test-101-fibonacci"/>
     <option name="compatibility:include-filter" value="art-run-test-102-concurrent-gc"/>
     <option name="compatibility:include-filter" value="art-run-test-103-string-append"/>
@@ -113,18 +109,15 @@
     <option name="compatibility:include-filter" value="art-run-test-129-ThreadGetId"/>
     <option name="compatibility:include-filter" value="art-run-test-132-daemon-locks-shutdown"/>
     <option name="compatibility:include-filter" value="art-run-test-133-static-invoke-super"/>
-    <option name="compatibility:include-filter" value="art-run-test-1338-gc-no-los"/>
     <option name="compatibility:include-filter" value="art-run-test-140-dce-regression"/>
     <option name="compatibility:include-filter" value="art-run-test-140-field-packing"/>
     <option name="compatibility:include-filter" value="art-run-test-143-string-value"/>
     <option name="compatibility:include-filter" value="art-run-test-144-static-field-sigquit"/>
-    <option name="compatibility:include-filter" value="art-run-test-145-alloc-tracking-stress"/>
     <option name="compatibility:include-filter" value="art-run-test-151-OpenFileLimit"/>
     <option name="compatibility:include-filter" value="art-run-test-152-dead-large-object"/>
     <option name="compatibility:include-filter" value="art-run-test-153-reference-stress"/>
     <option name="compatibility:include-filter" value="art-run-test-156-register-dex-file-multi-loader"/>
     <option name="compatibility:include-filter" value="art-run-test-159-app-image-fields"/>
-    <option name="compatibility:include-filter" value="art-run-test-160-read-barrier-stress"/>
     <option name="compatibility:include-filter" value="art-run-test-163-app-image-methods"/>
     <option name="compatibility:include-filter" value="art-run-test-165-lock-owner-proxy"/>
     <option name="compatibility:include-filter" value="art-run-test-168-vmstack-annotated"/>
@@ -148,11 +141,8 @@
     <option name="compatibility:include-filter" value="art-run-test-2028-MultiBackward"/>
     <option name="compatibility:include-filter" value="art-run-test-2029-contended-monitors"/>
     <option name="compatibility:include-filter" value="art-run-test-2030-long-running-child"/>
-    <option name="compatibility:include-filter" value="art-run-test-2042-checker-dce-always-throw"/>
     <option name="compatibility:include-filter" value="art-run-test-2231-checker-heap-poisoning"/>
     <option name="compatibility:include-filter" value="art-run-test-2232-write-metrics-to-log"/>
-    <option name="compatibility:include-filter" value="art-run-test-2234-checker-remove-entry-suspendcheck"/>
-    <option name="compatibility:include-filter" value="art-run-test-2236-JdkUnsafeGetLong-regression"/>
     <option name="compatibility:include-filter" value="art-run-test-300-package-override"/>
     <option name="compatibility:include-filter" value="art-run-test-301-abstract-protected"/>
     <option name="compatibility:include-filter" value="art-run-test-302-float-conversion"/>
@@ -167,7 +157,6 @@
     <option name="compatibility:include-filter" value="art-run-test-408-move-bug"/>
     <option name="compatibility:include-filter" value="art-run-test-409-materialized-condition"/>
     <option name="compatibility:include-filter" value="art-run-test-410-floats"/>
-    <option name="compatibility:include-filter" value="art-run-test-411-checker-hdiv-hrem-const"/>
     <option name="compatibility:include-filter" value="art-run-test-411-checker-hdiv-hrem-pow2"/>
     <option name="compatibility:include-filter" value="art-run-test-411-checker-instruct-simplifier-hrem"/>
     <option name="compatibility:include-filter" value="art-run-test-411-optimizing-arith"/>
@@ -204,7 +193,6 @@
     <option name="compatibility:include-filter" value="art-run-test-446-checker-inliner2"/>
     <option name="compatibility:include-filter" value="art-run-test-447-checker-inliner3"/>
     <option name="compatibility:include-filter" value="art-run-test-449-checker-bce-rem"/>
-    <option name="compatibility:include-filter" value="art-run-test-450-checker-types"/>
     <option name="compatibility:include-filter" value="art-run-test-451-regression-add-float"/>
     <option name="compatibility:include-filter" value="art-run-test-451-spill-splot"/>
     <option name="compatibility:include-filter" value="art-run-test-455-checker-gvn"/>
@@ -221,18 +209,15 @@
     <option name="compatibility:include-filter" value="art-run-test-474-checker-boolean-input"/>
     <option name="compatibility:include-filter" value="art-run-test-474-fp-sub-neg"/>
     <option name="compatibility:include-filter" value="art-run-test-475-simplify-mul-zero"/>
-    <option name="compatibility:include-filter" value="art-run-test-476-checker-ctor-fence-redun-elim"/>
     <option name="compatibility:include-filter" value="art-run-test-476-checker-ctor-memory-barrier"/>
     <option name="compatibility:include-filter" value="art-run-test-476-clinit-inline-static-invoke"/>
     <option name="compatibility:include-filter" value="art-run-test-477-checker-bound-type"/>
     <option name="compatibility:include-filter" value="art-run-test-477-long-2-float-convers-precision"/>
-    <option name="compatibility:include-filter" value="art-run-test-478-checker-clinit-check-pruning"/>
     <option name="compatibility:include-filter" value="art-run-test-478-checker-inline-noreturn"/>
     <option name="compatibility:include-filter" value="art-run-test-478-checker-inliner-nested-loop"/>
     <option name="compatibility:include-filter" value="art-run-test-479-regression-implicit-null-check"/>
     <option name="compatibility:include-filter" value="art-run-test-480-checker-dead-blocks"/>
     <option name="compatibility:include-filter" value="art-run-test-481-regression-phi-cond"/>
-    <option name="compatibility:include-filter" value="art-run-test-482-checker-loop-back-edge-use"/>
     <option name="compatibility:include-filter" value="art-run-test-483-dce-block"/>
     <option name="compatibility:include-filter" value="art-run-test-485-checker-dce-switch"/>
     <option name="compatibility:include-filter" value="art-run-test-486-checker-must-do-null-check"/>
@@ -261,22 +246,18 @@
     <option name="compatibility:include-filter" value="art-run-test-524-boolean-simplifier-regression"/>
     <option name="compatibility:include-filter" value="art-run-test-525-checker-arrays-fields1"/>
     <option name="compatibility:include-filter" value="art-run-test-525-checker-arrays-fields2"/>
-    <option name="compatibility:include-filter" value="art-run-test-526-checker-caller-callee-regs"/>
     <option name="compatibility:include-filter" value="art-run-test-526-long-regalloc"/>
     <option name="compatibility:include-filter" value="art-run-test-527-checker-array-access-simd"/>
     <option name="compatibility:include-filter" value="art-run-test-527-checker-array-access-split"/>
     <option name="compatibility:include-filter" value="art-run-test-528-long-hint"/>
     <option name="compatibility:include-filter" value="art-run-test-529-long-split"/>
-    <option name="compatibility:include-filter" value="art-run-test-530-checker-loops-try-catch"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-loops1"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-loops2"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-loops3"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-loops4"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-loops5"/>
-    <option name="compatibility:include-filter" value="art-run-test-530-checker-lse"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-lse-ctor-fences"/>
     <option name="compatibility:include-filter" value="art-run-test-530-checker-lse-simd"/>
-    <option name="compatibility:include-filter" value="art-run-test-530-checker-lse-try-catch"/>
     <option name="compatibility:include-filter" value="art-run-test-530-instanceof-checkcast"/>
     <option name="compatibility:include-filter" value="art-run-test-532-checker-nonnull-arrayset"/>
     <option name="compatibility:include-filter" value="art-run-test-534-checker-bce-deoptimization"/>
@@ -295,7 +276,6 @@
     <option name="compatibility:include-filter" value="art-run-test-550-checker-multiply-accumulate"/>
     <option name="compatibility:include-filter" value="art-run-test-550-new-instance-clinit"/>
     <option name="compatibility:include-filter" value="art-run-test-551-checker-clinit"/>
-    <option name="compatibility:include-filter" value="art-run-test-551-checker-shifter-operand"/>
     <option name="compatibility:include-filter" value="art-run-test-551-implicit-null-checks"/>
     <option name="compatibility:include-filter" value="art-run-test-552-checker-x86-avx2-bit-manipulation"/>
     <option name="compatibility:include-filter" value="art-run-test-554-checker-rtp-checkcast"/>
@@ -307,7 +287,6 @@
     <option name="compatibility:include-filter" value="art-run-test-561-divrem"/>
     <option name="compatibility:include-filter" value="art-run-test-561-shared-slowpaths"/>
     <option name="compatibility:include-filter" value="art-run-test-562-bce-preheader"/>
-    <option name="compatibility:include-filter" value="art-run-test-562-checker-no-intermediate"/>
     <option name="compatibility:include-filter" value="art-run-test-563-checker-invoke-super"/>
     <option name="compatibility:include-filter" value="art-run-test-564-checker-bitcount"/>
     <option name="compatibility:include-filter" value="art-run-test-564-checker-inline-loop"/>
@@ -324,13 +303,10 @@
     <option name="compatibility:include-filter" value="art-run-test-578-bce-visit"/>
     <option name="compatibility:include-filter" value="art-run-test-578-polymorphic-inlining"/>
     <option name="compatibility:include-filter" value="art-run-test-579-inline-infinite"/>
-    <option name="compatibility:include-filter" value="art-run-test-580-checker-fp16"/>
     <option name="compatibility:include-filter" value="art-run-test-580-checker-round"/>
-    <option name="compatibility:include-filter" value="art-run-test-580-checker-string-fact-intrinsics"/>
     <option name="compatibility:include-filter" value="art-run-test-580-crc32"/>
-    <option name="compatibility:include-filter" value="art-run-test-581-checker-rtp"/>
+    <option name="compatibility:include-filter" value="art-run-test-581-rtp"/>
     <option name="compatibility:include-filter" value="art-run-test-582-checker-bce-length"/>
-    <option name="compatibility:include-filter" value="art-run-test-583-checker-zero"/>
     <option name="compatibility:include-filter" value="art-run-test-584-checker-div-bool"/>
     <option name="compatibility:include-filter" value="art-run-test-589-super-imt"/>
     <option name="compatibility:include-filter" value="art-run-test-590-checker-arr-set-null-regression"/>
@@ -360,7 +336,6 @@
     <option name="compatibility:include-filter" value="art-run-test-635-checker-arm64-volatile-load-cc"/>
     <option name="compatibility:include-filter" value="art-run-test-636-arm64-veneer-pool"/>
     <option name="compatibility:include-filter" value="art-run-test-637-checker-throw-inline"/>
-    <option name="compatibility:include-filter" value="art-run-test-639-checker-code-sinking"/>
     <option name="compatibility:include-filter" value="art-run-test-640-checker-boolean-simd"/>
     <option name="compatibility:include-filter" value="art-run-test-640-checker-integer-valueof"/>
     <option name="compatibility:include-filter" value="art-run-test-640-checker-simd"/>
@@ -377,7 +352,6 @@
     <option name="compatibility:include-filter" value="art-run-test-656-checker-simd-opt"/>
     <option name="compatibility:include-filter" value="art-run-test-657-branches"/>
     <option name="compatibility:include-filter" value="art-run-test-658-fp-read-barrier"/>
-    <option name="compatibility:include-filter" value="art-run-test-659-unpadded-array"/>
     <option name="compatibility:include-filter" value="art-run-test-660-checker-sad"/>
     <option name="compatibility:include-filter" value="art-run-test-660-checker-simd-sad"/>
     <option name="compatibility:include-filter" value="art-run-test-661-checker-simd-reduc"/>
@@ -390,9 +364,10 @@
     <option name="compatibility:include-filter" value="art-run-test-671-npe-field-opts"/>
     <option name="compatibility:include-filter" value="art-run-test-672-checker-throw-method"/>
     <option name="compatibility:include-filter" value="art-run-test-673-checker-throw-vmethod"/>
+    <option name="compatibility:include-filter" value="art-run-test-674-HelloWorld-Dm"/>
     <option name="compatibility:include-filter" value="art-run-test-676-proxy-jit-at-first-use"/>
     <option name="compatibility:include-filter" value="art-run-test-677-fsi2"/>
-    <option name="compatibility:include-filter" value="art-run-test-678-quickening"/>
+    <option name="compatibility:include-filter" value="art-run-test-680-sink-regression"/>
     <option name="compatibility:include-filter" value="art-run-test-684-checker-simd-dotprod"/>
     <option name="compatibility:include-filter" value="art-run-test-684-select-condition"/>
     <option name="compatibility:include-filter" value="art-run-test-689-multi-catch"/>
@@ -406,13 +381,10 @@
     <option name="compatibility:include-filter" value="art-run-test-704-multiply-accumulate"/>
     <option name="compatibility:include-filter" value="art-run-test-705-register-conflict"/>
     <option name="compatibility:include-filter" value="art-run-test-711-checker-type-conversion"/>
-    <option name="compatibility:include-filter" value="art-run-test-713-varhandle-invokers"/>
     <option name="compatibility:include-filter" value="art-run-test-718-zipfile-finalizer"/>
-    <option name="compatibility:include-filter" value="art-run-test-719-varhandle-concurrency"/>
     <option name="compatibility:include-filter" value="art-run-test-721-osr"/>
     <option name="compatibility:include-filter" value="art-run-test-726-array-store"/>
     <option name="compatibility:include-filter" value="art-run-test-730-checker-inlining-super"/>
-    <option name="compatibility:include-filter" value="art-run-test-731-bounds-check-slow-path"/>
     <option name="compatibility:include-filter" value="art-run-test-805-TooDeepClassInstanceOf"/>
     <option name="compatibility:include-filter" value="art-run-test-806-TooWideClassInstanceOf"/>
     <option name="compatibility:include-filter" value="art-run-test-812-recursive-default"/>
@@ -420,11 +392,7 @@
     <option name="compatibility:include-filter" value="art-run-test-815-invokeinterface-default"/>
     <option name="compatibility:include-filter" value="art-run-test-818-clinit-nterp"/>
     <option name="compatibility:include-filter" value="art-run-test-821-madvise-willneed"/>
-    <option name="compatibility:include-filter" value="art-run-test-828-partial-lse"/>
-    <option name="compatibility:include-filter" value="art-run-test-834-lse"/>
-    <option name="compatibility:include-filter" value="art-run-test-835-b216762268"/>
     <option name="compatibility:include-filter" value="art-run-test-963-default-range-smali"/>
-    <option name="compatibility:include-filter" value="art_libnativebridge_cts_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_cmdline_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_compiler_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_dex2oat_tests"/>
@@ -432,23 +400,20 @@
     <option name="compatibility:include-filter" value="art_standalone_dexlist_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_libartbase_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_libartpalette_tests"/>
-    <option name="compatibility:include-filter" value="art_standalone_libartservice_tests"/>
-    <option name="compatibility:include-filter" value="art_standalone_libarttools_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_libdexfile_support_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_libdexfile_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_libprofile_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_oatdump_tests"/>
+    <option name="compatibility:include-filter" value="art_standalone_odrefresh_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_runtime_compiler_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_runtime_tests"/>
     <option name="compatibility:include-filter" value="art_standalone_sigchain_tests"/>
-    <option name="compatibility:include-filter" value="libnativeloader_test"/>
     <!-- Enable MainlineTestModuleController for ART run-tests. -->
     <!-- TODO(rpl): Find a way to express this list in a more concise fashion. -->
     <option name="compatibility:module-arg" value="art-run-test-001-HelloWorld:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-001-Main:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-002-sleep:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-004-InterfaceTest:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-004-NativeAllocations:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-004-checker-UnsafeTest18:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-006-args:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-007-count10:enable:true"/>
@@ -513,11 +478,8 @@
     <option name="compatibility:module-arg" value="art-run-test-093-serialization:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-094-pattern:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-095-switch-MAX_INT:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-096-array-copy-concurrent-gc:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-099-vmdebug:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-100-reflect2:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-1000-non-moving-space-stress:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-1004-checker-volatile-ref-load:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-101-fibonacci:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-102-concurrent-gc:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-103-string-append:enable:true"/>
@@ -540,18 +502,15 @@
     <option name="compatibility:module-arg" value="art-run-test-129-ThreadGetId:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-132-daemon-locks-shutdown:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-133-static-invoke-super:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-1338-gc-no-los:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-140-dce-regression:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-140-field-packing:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-143-string-value:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-144-static-field-sigquit:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-145-alloc-tracking-stress:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-151-OpenFileLimit:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-152-dead-large-object:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-153-reference-stress:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-156-register-dex-file-multi-loader:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-159-app-image-fields:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-160-read-barrier-stress:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-163-app-image-methods:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-165-lock-owner-proxy:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-168-vmstack-annotated:enable:true"/>
@@ -575,11 +534,8 @@
     <option name="compatibility:module-arg" value="art-run-test-2028-MultiBackward:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-2029-contended-monitors:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-2030-long-running-child:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-2042-checker-dce-always-throw:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-2231-checker-heap-poisoning:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-2232-write-metrics-to-log:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-2234-checker-remove-entry-suspendcheck:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-2236-JdkUnsafeGetLong-regression:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-300-package-override:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-301-abstract-protected:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-302-float-conversion:enable:true"/>
@@ -594,7 +550,6 @@
     <option name="compatibility:module-arg" value="art-run-test-408-move-bug:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-409-materialized-condition:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-410-floats:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-411-checker-hdiv-hrem-const:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-411-checker-hdiv-hrem-pow2:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-411-checker-instruct-simplifier-hrem:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-411-optimizing-arith:enable:true"/>
@@ -631,7 +586,6 @@
     <option name="compatibility:module-arg" value="art-run-test-446-checker-inliner2:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-447-checker-inliner3:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-449-checker-bce-rem:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-450-checker-types:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-451-regression-add-float:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-451-spill-splot:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-455-checker-gvn:enable:true"/>
@@ -648,18 +602,15 @@
     <option name="compatibility:module-arg" value="art-run-test-474-checker-boolean-input:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-474-fp-sub-neg:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-475-simplify-mul-zero:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-476-checker-ctor-fence-redun-elim:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-476-checker-ctor-memory-barrier:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-476-clinit-inline-static-invoke:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-477-checker-bound-type:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-477-long-2-float-convers-precision:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-478-checker-clinit-check-pruning:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-478-checker-inline-noreturn:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-478-checker-inliner-nested-loop:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-479-regression-implicit-null-check:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-480-checker-dead-blocks:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-481-regression-phi-cond:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-482-checker-loop-back-edge-use:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-483-dce-block:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-485-checker-dce-switch:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-486-checker-must-do-null-check:enable:true"/>
@@ -688,22 +639,18 @@
     <option name="compatibility:module-arg" value="art-run-test-524-boolean-simplifier-regression:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-525-checker-arrays-fields1:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-525-checker-arrays-fields2:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-526-checker-caller-callee-regs:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-526-long-regalloc:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-527-checker-array-access-simd:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-527-checker-array-access-split:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-528-long-hint:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-529-long-split:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-530-checker-loops-try-catch:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-loops1:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-loops2:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-loops3:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-loops4:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-loops5:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-530-checker-lse:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-lse-ctor-fences:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-checker-lse-simd:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-530-checker-lse-try-catch:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-530-instanceof-checkcast:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-532-checker-nonnull-arrayset:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-534-checker-bce-deoptimization:enable:true"/>
@@ -722,7 +669,6 @@
     <option name="compatibility:module-arg" value="art-run-test-550-checker-multiply-accumulate:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-550-new-instance-clinit:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-551-checker-clinit:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-551-checker-shifter-operand:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-551-implicit-null-checks:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-552-checker-x86-avx2-bit-manipulation:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-554-checker-rtp-checkcast:enable:true"/>
@@ -734,7 +680,6 @@
     <option name="compatibility:module-arg" value="art-run-test-561-divrem:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-561-shared-slowpaths:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-562-bce-preheader:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-562-checker-no-intermediate:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-563-checker-invoke-super:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-564-checker-bitcount:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-564-checker-inline-loop:enable:true"/>
@@ -751,13 +696,10 @@
     <option name="compatibility:module-arg" value="art-run-test-578-bce-visit:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-578-polymorphic-inlining:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-579-inline-infinite:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-580-checker-fp16:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-580-checker-round:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-580-checker-string-fact-intrinsics:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-580-crc32:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-581-checker-rtp:enable:true"/>
+    <option name="compatibility:module-arg" value="art-run-test-581-rtp:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-582-checker-bce-length:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-583-checker-zero:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-584-checker-div-bool:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-589-super-imt:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-590-checker-arr-set-null-regression:enable:true"/>
@@ -787,7 +729,6 @@
     <option name="compatibility:module-arg" value="art-run-test-635-checker-arm64-volatile-load-cc:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-636-arm64-veneer-pool:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-637-checker-throw-inline:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-639-checker-code-sinking:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-640-checker-boolean-simd:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-640-checker-integer-valueof:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-640-checker-simd:enable:true"/>
@@ -804,7 +745,6 @@
     <option name="compatibility:module-arg" value="art-run-test-656-checker-simd-opt:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-657-branches:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-658-fp-read-barrier:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-659-unpadded-array:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-660-checker-sad:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-660-checker-simd-sad:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-661-checker-simd-reduc:enable:true"/>
@@ -817,9 +757,10 @@
     <option name="compatibility:module-arg" value="art-run-test-671-npe-field-opts:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-672-checker-throw-method:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-673-checker-throw-vmethod:enable:true"/>
+    <option name="compatibility:module-arg" value="art-run-test-674-HelloWorld-Dm:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-676-proxy-jit-at-first-use:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-677-fsi2:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-678-quickening:enable:true"/>
+    <option name="compatibility:module-arg" value="art-run-test-680-sink-regression:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-684-checker-simd-dotprod:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-684-select-condition:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-689-multi-catch:enable:true"/>
@@ -833,13 +774,10 @@
     <option name="compatibility:module-arg" value="art-run-test-704-multiply-accumulate:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-705-register-conflict:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-711-checker-type-conversion:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-713-varhandle-invokers:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-718-zipfile-finalizer:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-719-varhandle-concurrency:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-721-osr:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-726-array-store:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-730-checker-inlining-super:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-731-bounds-check-slow-path:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-805-TooDeepClassInstanceOf:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-806-TooWideClassInstanceOf:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-812-recursive-default:enable:true"/>
@@ -847,11 +785,7 @@
     <option name="compatibility:module-arg" value="art-run-test-815-invokeinterface-default:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-818-clinit-nterp:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-821-madvise-willneed:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-828-partial-lse:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-834-lse:enable:true"/>
-    <option name="compatibility:module-arg" value="art-run-test-835-b216762268:enable:true"/>
     <option name="compatibility:module-arg" value="art-run-test-963-default-range-smali:enable:true"/>
-    <option name="compatibility:module-arg" value="art_libnativebridge_cts_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_cmdline_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_compiler_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_dex2oat_tests:enable:true"/>
@@ -859,14 +793,12 @@
     <option name="compatibility:module-arg" value="art_standalone_dexlist_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_libartbase_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_libartpalette_tests:enable:true"/>
-    <option name="compatibility:module-arg" value="art_standalone_libartservice_tests:enable:true"/>
-    <option name="compatibility:module-arg" value="art_standalone_libarttools_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_libdexfile_support_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_libdexfile_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_libprofile_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_oatdump_tests:enable:true"/>
+    <option name="compatibility:module-arg" value="art_standalone_odrefresh_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_runtime_compiler_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_runtime_tests:enable:true"/>
     <option name="compatibility:module-arg" value="art_standalone_sigchain_tests:enable:true"/>
-    <option name="compatibility:module-arg" value="libnativeloader_test:enable:true"/>
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
index 41cec46..038d477 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
@@ -18,20 +18,4 @@
     <include name="mts-art-tests-list-user-shard-00"/>
     <include name="mts-art-tests-list-user-shard-01"/>
     <include name="mts-art-tests-list-user-shard-02"/>
-    <!-- Excluded flaky tests (b/209958457). -->
-    <option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lockJJZ_Exclusive_asyncChannel"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lockJJZ_Exclusive_syncChannel"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lock_differentChannelTypes"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lockJJZ_Shared_asyncChannel"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lockJJZ_Shared_syncChannel"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_interrupt_read_withoutAutoClose[0: TLSv1.2 client, TLSv1.2 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_interrupt_read_withoutAutoClose[1: TLSv1.2 client, TLSv1.3 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_interrupt_read_withoutAutoClose[2: TLSv1.3 client, TLSv1.2 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_interrupt_read_withoutAutoClose[3: TLSv1.3 client, TLSv1.3 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_setSoWriteTimeout[0: TLSv1.2 client, TLSv1.2 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_setSoWriteTimeout[1: TLSv1.2 client, TLSv1.3 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_setSoWriteTimeout[2: TLSv1.3 client, TLSv1.2 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_setSoWriteTimeout[3: TLSv1.3 client, TLSv1.3 server]"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.dalvik.system.DelegateLastClassLoaderTest#testLookupOrderNodelegate_getResource"/>
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.dalvik.system.DelegateLastClassLoaderTest#testLookupOrder_getResource"/>
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml
deleted file mode 100644
index f766032..0000000
--- a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="List of stat MTS tests that do not need root access.">
-
-    <!-- Include Java test suites -->
-    <option name="compatibility:include-filter" value="CtsBluetoothTestCases" />
-    <option name="compatibility:include-filter" value="BluetoothTests" />
-    <option name="compatibility:include-filter" value="ServiceBluetoothTests" />
-    <option name="compatibility:include-filter" value="GoogleBluetoothInstrumentationTests" />
-
-    <!-- Include native tests -->
-    <option name="compatibility:include-filter" value="net_test_audio_a2dp_hw" />
-    <option name="compatibility:include-filter" value="net_test_audio_hearing_aid_hw" />
-    <option name="compatibility:include-filter" value="net_test_bta" />
-    <option name="compatibility:include-filter" value="bt_host_test_bta" />
-    <option name="compatibility:include-filter" value="net_test_hf_client_add_record" />
-    <option name="compatibility:include-filter" value="bluetooth_csis_test" />
-    <option name="compatibility:include-filter" value="bluetooth_groups_test" />
-    <option name="compatibility:include-filter" value="bluetooth_vc_test" />
-    <option name="compatibility:include-filter" value="bluetooth_le_audio_test" />
-    <option name="compatibility:include-filter" value="bluetooth_le_audio_client_test" />
-    <option name="compatibility:include-filter" value="bluetooth_test_broadcaster_sm" />
-    <option name="compatibility:include-filter" value="bluetooth_test_broadcaster" />
-    <option name="compatibility:include-filter" value="bluetooth_has_test" />
-    <option name="compatibility:include-filter" value="net_test_btcore" />
-    <option name="compatibility:include-filter" value="net_test_btif" />
-    <option name="compatibility:include-filter" value="net_test_btif_profile_queue" />
-    <option name="compatibility:include-filter" value="net_test_btif_rc" />
-    <option name="compatibility:include-filter" value="net_test_btif_config_cache" />
-    <option name="compatibility:include-filter" value="net_test_btif_hf_client_service" />
-    <option name="compatibility:include-filter" value="net_test_btif_stack" />
-    <option name="compatibility:include-filter" value="bluetooth_test_common" />
-    <option name="compatibility:include-filter" value="net_test_performance" />
-    <option name="compatibility:include-filter" value="net_test_device" />
-    <option name="compatibility:include-filter" value="bluetooth_test_gd_unit" />
-    <option name="compatibility:include-filter" value="bluetooth_packet_parser_test" />
-    <option name="compatibility:include-filter" value="bluetooth_flatbuffer_tests" />
-    <option name="compatibility:include-filter" value="net_test_hci" />
-    <option name="compatibility:include-filter" value="net_test_hci_native" />
-    <option name="compatibility:include-filter" value="net_test_hci_fragmenter_native" />
-    <option name="compatibility:include-filter" value="net_test_main_shim" />
-    <option name="compatibility:include-filter" value="net_test_osi" />
-    <option name="compatibility:include-filter" value="net_test_btpackets" />
-    <option name="compatibility:include-filter" value="net_test_avrcp" />
-    <option name="compatibility:include-filter" value="bluetooth_test_sdp" />
-    <option name="compatibility:include-filter" value="bluetoothtbd_test" />
-    <option name="compatibility:include-filter" value="net_test_stack" />
-    <option name="compatibility:include-filter" value="net_test_stack_rfcomm" />
-    <option name="compatibility:include-filter" value="net_test_stack_smp" />
-    <option name="compatibility:include-filter" value="net_test_stack_multi_adv" />
-    <option name="compatibility:include-filter" value="net_test_stack_ad_parser" />
-    <option name="compatibility:include-filter" value="net_test_stack_gatt_native" />
-    <option name="compatibility:include-filter" value="net_test_stack_avdtp" />
-    <option name="compatibility:include-filter" value="net_test_stack_a2dp_native" />
-    <option name="compatibility:include-filter" value="net_test_stack_gatt_sr_hash_native" />
-    <option name="compatibility:include-filter" value="net_test_btm_iso" />
-    <option name="compatibility:include-filter" value="net_test_eatt" />
-    <option name="compatibility:include-filter" value="net_test_stack_btm" />
-    <option name="compatibility:include-filter" value="net_test_stack_hci" />
-    <option name="compatibility:include-filter" value="net_test_stack_hid" />
-    <option name="compatibility:include-filter" value="net_test_stack_btu" />
-    <option name="compatibility:include-filter" value="net_test_stack_gatt" />
-    <option name="compatibility:include-filter" value="net_test_stack_l2cap" />
-    <option name="compatibility:include-filter" value="net_test_stack_acl" />
-    <option name="compatibility:include-filter" value="bt_headless" />
-    <option name="compatibility:include-filter" value="net_test_bluetooth" />
-    <option name="compatibility:include-filter" value="net_test_types" />
-    <option name="compatibility:include-filter" value="libbt_packets_test" />
-    <option name="compatibility:include-filter" value="packets_test_rust" />
-    <option name="compatibility:include-filter" value="libbluetooth_rs_test" />
-
-
-    <!-- Enable MainlineTestModuleController for Java test suites -->
-    <option name="compatibility:module-arg" value="CtsBluetoothTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="BluetoothTests:enable:true" />
-    <option name="compatibility:module-arg" value="ServiceBluetoothTests:enable:true" />
-    <option name="compatibility:module-arg" value="GoogleBluetoothInstrumentationTests:enable:true" />
-
-    <!-- Enable MainlineTestModuleController for Native tests -->
-    <option name="compatibility:module-arg" value="net_test_audio_a2dp_hw:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_audio_hearing_aid_hw:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_bta:enable:true" />
-    <option name="compatibility:module-arg" value="bt_host_test_bta:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_hf_client_add_record:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_csis_test:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_groups_test:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_vc_test:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_le_audio_test:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_le_audio_client_test:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_test_broadcaster_sm:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_test_broadcaster:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_has_test:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btcore:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btif:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btif_profile_queue:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btif_rc:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btif_config_cache:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btif_hf_client_service:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btif_stack:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_test_common:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_performance:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_device:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_test_gd_unit:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_packet_parser_test:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_flatbuffer_tests:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_hci:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_hci_native:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_hci_fragmenter_native:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_main_shim:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_osi:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btpackets:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_avrcp:enable:true" />
-    <option name="compatibility:module-arg" value="bluetooth_test_sdp:enable:true" />
-    <option name="compatibility:module-arg" value="bluetoothtbd_test:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_rfcomm:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_smp:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_multi_adv:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_ad_parser:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_gatt_native:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_avdtp:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_a2dp_native:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_gatt_sr_hash_native:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_btm_iso:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_eatt:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_btm:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_hci:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_hid:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_btu:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_gatt:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_l2cap:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_stack_acl:enable:true" />
-    <option name="compatibility:module-arg" value="bt_headless:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_bluetooth:enable:true" />
-    <option name="compatibility:module-arg" value="net_test_types:enable:true" />
-    <option name="compatibility:module-arg" value="libbt_packets_test:enable:true" />
-    <option name="compatibility:module-arg" value="packets_test_rust:enable:true" />
-    <option name="compatibility:module-arg" value="libbluetooth_rs_test:enable:true" />
-
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth.xml b/tools/mts-tradefed/res/config/mts-bluetooth.xml
deleted file mode 100644
index 7d677aa..0000000
--- a/tools/mts-tradefed/res/config/mts-bluetooth.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs MTS-bluetooth from a pre-existing MTS installation">
-
-    <include name="mts" />
-
-    <include name="mts-bluetooth-tests-list" />
-
-    <option name="plan" value="mts-bluetooth" />
-
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
-        <option name="property-name" value="ro.build.type" />
-        <option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
-        <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
-    </target_preparer>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-conscrypt-tests-list.xml b/tools/mts-tradefed/res/config/mts-conscrypt-tests-list.xml
index d61c506..ac8f442 100644
--- a/tools/mts-tradefed/res/config/mts-conscrypt-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-conscrypt-tests-list.xml
@@ -14,8 +14,6 @@
      limitations under the License.
 -->
 <configuration description="List MTS conscrypt tests.">
-    <option name="compatibility:include-filter" value="boringssl_crypto_test" />
-    <option name="compatibility:include-filter" value="boringssl_ssl_test" />
     <option name="compatibility:include-filter" value="CtsLibcoreOkHttpTestCases" />
     <option name="compatibility:include-filter" value="MtsConscryptTestCases" />
     <option name="compatibility:include-filter" value="MtsConscryptFdSocketTestCases" />
diff --git a/tools/mts-tradefed/res/config/mts-core-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-core-tests-list-eng-only.xml
deleted file mode 100644
index 3359e44..0000000
--- a/tools/mts-tradefed/res/config/mts-core-tests-list-eng-only.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs MTS-core tests that need root access">
-
-    <option name="compatibility:include-filter" value="ApexSystemServicesTestCases" />
-
-    <option name="compatibility:include-filter"
-      value="UpdatableSharedLibsTest" />
-
-    <option name="compatibility:include-filter" value="ApkInApexTest" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-core-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-core-tests-list.xml
similarity index 90%
rename from tools/mts-tradefed/res/config/mts-core-tests-list-user.xml
rename to tools/mts-tradefed/res/config/mts-core-tests-list.xml
index 47434d0..930bde3 100644
--- a/tools/mts-tradefed/res/config/mts-core-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-core-tests-list.xml
@@ -16,6 +16,6 @@
 <configuration description="Runs MTS-core from a pre-existing MTS installation">
 
     <option name="compatibility:include-filter" value="CtsStrictJavaPackagesTestCases" />
-    <option name="compatibility:include-filter" value="ModulesUtilsTestingTests" />
 
 </configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-core.xml b/tools/mts-tradefed/res/config/mts-core.xml
index 8a7c92c..ba5a913 100644
--- a/tools/mts-tradefed/res/config/mts-core.xml
+++ b/tools/mts-tradefed/res/config/mts-core.xml
@@ -17,8 +17,7 @@
 
     <include name="mts" />
 
-    <include name="mts-core-tests-list-user" />
-    <include name="mts-core-tests-list-eng-only" />
+    <include name="mts-core-tests-list" />
 
     <option name="plan" value="mts-core" />
 
diff --git a/tools/mts-tradefed/res/config/mts-adservices.xml b/tools/mts-tradefed/res/config/mts-cronet.xml
similarity index 71%
rename from tools/mts-tradefed/res/config/mts-adservices.xml
rename to tools/mts-tradefed/res/config/mts-cronet.xml
index 4e54b99..0b6425e 100644
--- a/tools/mts-tradefed/res/config/mts-adservices.xml
+++ b/tools/mts-tradefed/res/config/mts-cronet.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
+<!-- Copyright (C) 2019 The Android Open Source Project
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
+
           http://www.apache.org/licenses/LICENSE-2.0
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<configuration description="Runs MTS-adservices from a pre-existing MTS installation">
+<configuration description="Runs MTS-cronet from a pre-existing MTS installation">
 
     <include name="mts" />
 
-    <include name="mts-adservices-tests-list" />
+    <option name="plan" value="mts-cronet" />
 
-    <option name="plan" value="mts-adservices" />
+    <option name="compatibility:include-filter" value="CtsCronetTestCases" />
 
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-exclude.xml b/tools/mts-tradefed/res/config/mts-exclude.xml
index 8613777..8547d98 100644
--- a/tools/mts-tradefed/res/config/mts-exclude.xml
+++ b/tools/mts-tradefed/res/config/mts-exclude.xml
@@ -17,10 +17,10 @@
     <option name="plan" value="mts-exclude" />
 
     <!-- b/156732610, b/156731539, b/156729972, b/156729967 Flaky test for media-->
-   <option name="compatibility:exclude-filter" value="CtsMediaPlayerTestCases MediaPlayerTest.testSeekModes" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases MediaSessionManagerTest.testGetSession2TokensWithTwoSessions" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases MediaSessionManagerTest.testRemoteUserInfo" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases MediaSessionManagerTest.testSetOnMediaKeyListener" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases MediaPlayerTest.testSeekModes" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases MediaSessionManagerTest.testGetSession2TokensWithTwoSessions" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases MediaSessionManagerTest.testRemoteUserInfo" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases MediaSessionManagerTest.testSetOnMediaKeyListener" />
 
     <!-- b/156436397 Flaky test for MediaProvider-->
     <option name="compatibility:exclude-filter" value="MediaProviderTests MediaProviderForFuseTest.test_scanFileForFuseis" />
@@ -87,11 +87,8 @@
     <option name="compatibility:exclude-filter" value="GtsBackupHostTestCases com.google.android.gts.backup.SettingsBackupValidationHostSideTest" />
     <option name="compatibility:exclude-filter" value="GtsBackupHostTestCases com.google.android.gts.backup.AccessibilityServiceRestoreHostSideTest" />
 
-    <!-- b/234821097: Flaky test due to hardware and test setup, not related to the module-->
-    <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTest11mcApUsingResponderConfig" />
-    <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTest11mcApUsingScanResult" />
-    <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestNon11mcApUsingResponderConfig" />
-    <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestNon11mcApUsingScanResult" />
+    <!-- b/110385515: Flaky test -->
+    <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestAp" />
     <!-- TODO(b/153088610): Missing AP support in test lab -->
     <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestApWithResponderLocation" />
 
@@ -129,18 +126,14 @@
 
     <!--Tests from CTS known faliures-->
 
+    <!-- b/38224690 -->
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeEncoderTest" />
+
     <!-- b/38280830 -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
 
     <!-- Exclude tests that are not related to media mainlines -->
-    <option name="compatibility:module-arg" value="CtsMediaCodecTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaMiscTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaV2TestCases:exclude-annotation:android.mediav2.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaStressTestCases:exclude-annotation:android.mediastress.cts.NonMediaMainlineTest" />
+    <option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
 
     <!-- Exclude cell broadcast module tests which are not unit tests -->
     <option name="compatibility:module-arg" value="CellBroadcastReceiverOemUnitTests:exclude-annotation:com.google.android.cellbroadcastreceiver.unit.InstrumentationTest" />
@@ -180,20 +173,20 @@
     <!-- https://b.corp.google.com/hotlists/2163558 Flaky test for Permission Controller-->
 
     <!-- https://b.corp.google.com/hotlists/2163722: Flaky test for media -->
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaScannerTest#testCanonicalize" />
-   <option name="compatibility:exclude-filter" value="CtsMediaDrmFrameworkTestCases android.media.drmframework.cts.MediaPlayerDrmTest#testCAR_CLEARKEY_AUDIO_DOWNLOADED_V0_SYNC" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSyncTest#testPlayAudio" />
-   <option name="compatibility:exclude-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testPlayAudioAmr" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaCodecListTest#testVideoPerformancePointsSanity" />
-   <option name="compatibility:exclude-filter" value="CtsMediaRecorderTestCases android.media.recorder.cts.MediaRecorderTest#testGetSurfaceApi" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.ResourceManagerTest#testReclaimResourceMixVsNonsecure" />
-   <option name="compatibility:exclude-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testGapless1" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSyncTest#testAudioBufferReturn" />
-   <option name="compatibility:exclude-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testPlayAudioTwice" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaScannerTest#testEncodingDetection" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaScannerTest#testWildcardPaths" />
-   <option name="compatibility:exclude-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testPositionAtEnd" />
-   <option name="compatibility:exclude-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSyncTest#testPlaybackRateDouble" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaScannerTest#testCanonicalize" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaPlayerDrmTest#testCAR_CLEARKEY_AUDIO_DOWNLOADED_V0_SYNC" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaSyncTest#testPlayAudio" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaPlayerTest#testPlayAudioAmr" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaCodecListTest#testVideoPerformancePointsSanity" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaRecorderTest#testGetSurfaceApi" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.ResourceManagerTest#testReclaimResourceMixVsNonsecure" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaPlayerTest#testGapless1" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaSyncTest#testAudioBufferReturn" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaPlayerTest#testPlayAudioTwice" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaScannerTest#testEncodingDetection" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaScannerTest#testWildcardPaths" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaPlayerTest#testPositionAtEnd" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases  android.media.cts.MediaSyncTest#testPlaybackRateDouble" />
 
     <!-- b/144859812: Flaky test -->
     <option name="compatibility:exclude-filter" value="DocumentsUIGoogleTests com.android.documentsui.FileCopyUiTest#testCopyDocuments_InternalStorage" />
@@ -215,25 +208,25 @@
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.EncodeDecodeTest#testEncodeDecodeVideoFromBufferToBufferQVGA0" />
 
     <!-- b/144590142: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testVP8Decode640x360" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testVP8Decode640x360" />
 
     <!-- b/144590245: MTS flaky test -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoEncoderTest#testGoogH264FlexNearMaxMax" />
 
     <!-- b/142976793: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeMonoOggMp4" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeMonoOggMp4" />
 
     <!-- b/144798271: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaCodecTestCases android.media.codec.cts.MediaCodecCapabilitiesTest#testAvcHigh31" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaCodecCapabilitiesTest#testAvcHigh31" />
 
     <!-- b/144590380: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.NativeMediaDrmClearkeyTest#testClearKeyPlaybackCenc2" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeMediaDrmClearkeyTest#testClearKeyPlaybackCenc2" />
 
     <!-- b/142965402: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaCodecTestCases android.media.codec.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
 
     <!-- b/159668249: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaAudioTestCases android.media.audio.cts.VisualizerTest" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VisualizerTest" />
 
     <!-- b/145554519: MTS flaky tests -->
     <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.java.net.InetAddressTest#test_isReachable_by_ICMP" />
diff --git a/tools/mts-tradefed/res/config/mts-linkerconfig-tests-list.xml b/tools/mts-tradefed/res/config/mts-linkerconfig-tests-list.xml
deleted file mode 100644
index 442e3d9..0000000
--- a/tools/mts-tradefed/res/config/mts-linkerconfig-tests-list.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="List of linkerconfig MTS tests">
-  <!-- Include tests from GTS -->
-  <option name="compatibility:include-filter" value="GtsLinkerConfigTestCases" />
-
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-linkerconfig.xml b/tools/mts-tradefed/res/config/mts-linkerconfig.xml
deleted file mode 100644
index 955417a..0000000
--- a/tools/mts-tradefed/res/config/mts-linkerconfig.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs MTS-linkerconfig from a pre-existing MTS installation">
-  <include name="mts" />
-
-  <include name="mts-linkerconfig-tests-list" />
-
-  <option name="plan" value="mts-linkerconfig" />
-
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-media-tests-list.xml b/tools/mts-tradefed/res/config/mts-media-tests-list.xml
index a24ef55..a39efd1 100644
--- a/tools/mts-tradefed/res/config/mts-media-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-media-tests-list.xml
@@ -14,59 +14,33 @@
      limitations under the License.
 -->
 <configuration description="List MTS media tests">
-        <!-- These Media CTS tests are mostly relevant to mainline.
-            The "mostly" is addressed with annotations to exclude specific tests in each suite.
-        -->
-    <option name="compatibility:include-filter" value="CtsMediaCodecTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaCodecTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaCodecTestCases:instrumentation-arg:mts-media:=true" />
-
-    <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:instrumentation-arg:mts-media:=true" />
-
-    <option name="compatibility:include-filter" value="CtsMediaEncoderTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:instrumentation-arg:mts-media:=true" />
-
-    <option name="compatibility:include-filter" value="CtsMediaExtractorTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:instrumentation-arg:mts-media:=true" />
-
-    <option name="compatibility:include-filter" value="CtsMediaMiscTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaMiscTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaMiscTestCases:instrumentation-arg:mts-media:=true" />
-
-    <option name="compatibility:include-filter" value="CtsMediaPlayerTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
-    <option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:instrumentation-arg:mts-media:=true" />
-
+    <option name="compatibility:include-filter" value="CtsMediaTestCases" />
     <option name="compatibility:include-filter" value="CtsMediaV2TestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaV2TestCases:exclude-annotation:android.mediav2.cts.NonMediaMainlineTest" />
-
     <option name="compatibility:include-filter" value="CtsMediaParserTestCases" />
-
     <option name="compatibility:include-filter" value="CtsMediaStressTestCases" />
-    <option name="compatibility:module-arg" value="CtsMediaStressTestCases:exclude-annotation:android.mediastress.cts.NonMediaMainlineTest" />
-
     <option name="compatibility:include-filter" value="CtsMediaTranscodingTestCases" />
-
-    <!-- unit tests -->
-    <option name="compatibility:include-filter" value="CodecListTest" />
     <option name="compatibility:include-filter" value="Mpeg4H263DecoderTest" />
 
     <!--b/138964734-->
-    <option name="compatibility:exclude-filter" value="CtsMediaCodecTestCases android.media.codec.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
 
-    <!--Exclude some tests with known CTS failures-->
+    <!--Tests from CTS known failures-->
 
     <!-- b/38224690 -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeEncoderTest" />
 
     <!-- b/38280830 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
 
-    <!-- Restrict mediav2 codec tests to the codecs shipped in the module: c2.android.* -->
+    <!-- Exclude tests that are not related to media mainlines -->
+    <option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+    <option name="compatibility:module-arg" value="CtsMediaStressTestCases:exclude-annotation:android.mediastress.cts.NonMediaMainlineTest" />
+    <option name="compatibility:module-arg" value="CtsMediaV2TestCases:exclude-annotation:android.mediav2.cts.NonMediaMainlineTest" />
+
+    <!-- Advertise the test suite to media cts. -->
+    <option name="compatibility:module-arg" value="CtsMediaTestCases:instrumentation-arg:mts-media:=true" />
+
+    <!-- Run media v2 tests for codec names starting with c2.android. -->
     <option name="compatibility:module-arg" value="CtsMediaV2TestCases:instrumentation-arg:codec-prefix:=c2.android." />
 
     <!-- Unit tests dynamically download test media -->
diff --git a/tools/mts-tradefed/res/config/mts-network-tests-list.xml b/tools/mts-tradefed/res/config/mts-network-tests-list.xml
index 11dcff1..5b79c25 100644
--- a/tools/mts-tradefed/res/config/mts-network-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-network-tests-list.xml
@@ -15,7 +15,6 @@
 -->
 <configuration description="List MTS network tests.">
     <option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
-    <option name="compatibility:include-filter" value="CaptivePortalLoginTests" />
     <option name="compatibility:module-arg" value="CtsNetTestCasesLatestSdk:exclude-annotation:com.android.testutils.ConnectivityModuleTest" />
 </configuration>
 
diff --git a/tools/mts-tradefed/res/config/mts-neuralnetworks-tests-list.xml b/tools/mts-tradefed/res/config/mts-neuralnetworks-tests-list.xml
index 08e3be2..6ff3f04 100644
--- a/tools/mts-tradefed/res/config/mts-neuralnetworks-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-neuralnetworks-tests-list.xml
@@ -18,11 +18,9 @@
     <option name="compatibility:include-filter" value="CtsNNAPITestCases" />
     <option name="compatibility:include-filter" value="CtsNNAPIBenchmarkTestCases" />
     <option name="compatibility:include-filter" value="CtsTfliteNnapiDelegateTestCases" />
-    <option name="compatibility:include-filter" value="CtsNNAPIStatsdAtomHostTestCases" />
 
     <!-- Enable MainlineTestModuleController for Neuralnetworks -->
     <option name="compatibility:module-arg" value="CtsNNAPITestCases:enable:true" />
     <option name="compatibility:module-arg" value="CtsNNAPIBenchmarkTestCases:enable:true" />
     <option name="compatibility:module-arg" value="CtsTfliteNnapiDelegateTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="CtsNNAPIStatsdAtomHostTestCases:enable:true" />
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml b/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml
deleted file mode 100644
index b7f9cfb..0000000
--- a/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<configuration description="List test modules of OnDevicePersonalization module. This is a placeholder xml instead of a runnable plan.">
-    <option name="compatibility:include-filter"
-            value="CtsOnDevicePersonalizationTestCases android.ondevicepersonalization.cts.OnDevicePersonalizationServiceTest" />
-    <option name="compatibility:include-filter"
-            value="OnDevicePersonalizationManagerServicesTests" />
-
-
-    <option name="compatibility:module-arg" value="CtsOnDevicePersonalizationTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="OnDevicePersonalizationManagerServicesTests:enable:true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-ondevicepersonalization.xml b/tools/mts-tradefed/res/config/mts-ondevicepersonalization.xml
deleted file mode 100644
index 7b0da52..0000000
--- a/tools/mts-tradefed/res/config/mts-ondevicepersonalization.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<configuration description="Runs MTS-ondevicepersonalization from a pre-existing MTS installation">
-
-    <include name="mts" />
-
-    <include name="mts-ondevicepersonalization-tests-list" />
-
-    <option name="plan" value="mts-ondevicepersonalization" />
-
-    <option name="compatibility:primary-abi-only" value="true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml b/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
index a707305..e9b8472 100644
--- a/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
+++ b/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
@@ -20,10 +20,8 @@
     <option name="compatibility:include-filter" value="PermissionApexTests" />
     <option name="compatibility:include-filter" value="PermissionControllerMockingTests" />
     <option name="compatibility:include-filter" value="PermissionControllerOutOfProcessTests" />
-    <option name="compatibility:include-filter" value="PermissionUiTestCases" />
     <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.BackgroundPermissionsTest" />
     <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.LocationAccessCheckTest" />
-    <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.NotificationListenerCheckTest" />
     <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.OneTimePermissionTest" />
     <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.PermissionControllerTest" />
     <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.PlatformPermissionGroupMappingTest" />
@@ -40,8 +38,6 @@
     <option name="compatibility:module-arg" value="CtsOsTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
     <option name="compatibility:include-filter" value="CtsRoleTestCases" />
     <option name="compatibility:module-arg" value="CtsRoleTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
-    <option name="compatibility:include-filter" value="CtsSafetyCenterTestCases" />
-    <option name="compatibility:module-arg" value="CtsSafetyCenterTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
     <option name="compatibility:include-filter" value="GtsIncidentManagerTestCases" />
     <option name="compatibility:module-arg" value="GtsIncidentManagerTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-smoke-tests-list.xml b/tools/mts-tradefed/res/config/mts-smoke-tests-list.xml
index a2a828f..a061042 100644
--- a/tools/mts-tradefed/res/config/mts-smoke-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-smoke-tests-list.xml
@@ -51,238 +51,232 @@
      <option name="compatibility:include-filter" value="CtsIkeTestCases" />
 
      <!-- Media -->
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testAV1Decode30fps3840x2160" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testBFrames" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicH263" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicH264" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicHEVC" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicMpeg2" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicMpeg4" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicVP8" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testCodecBasicVP9" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecode51M4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeAacTs" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeFlac" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeFlacMkv" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeFlacMp4" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeFragmented" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeG711ChannelsAndRates" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeMonoGsm" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeMonoM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeMonoMp3" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeMonoOgg" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeOgg" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeOpus" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeOpusChannelsAndRates" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeOpusMp4" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeVorbis" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testDecodeWav" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testMpeg2Decode30fps1920x1080" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTest#testMpeg2Decode30fps1920x1080Tv" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcLevelM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcHeavyM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcFullM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacInternalClipM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcOutputLoudnessM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcOffM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcHalfM4a" />
-     <option name="compatibility:include-filter" value="CtsMediaDecoderTestCases android.media.decoder.cts.DecoderTestAacDrc#testDecodeAacDrcClipM4a" />
-
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaDrmClearkeyTest#testClearKeyPlaybackWebm" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testAC3inMP4" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testAC3inTS" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testAC4inMP4" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testAV1InMP4" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testAdvance" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionInMP4" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvav1" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvav1_2" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvavSe" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvheDtr" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvheSt" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvheStn" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testEAC3inMP4" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testEAC3inTS" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testExtractFromAMediaDataSource" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testExtractFromAssetFileDescriptor" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testExtractorFailsIfMediaDataSourceReturnsAnError" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testExtractorFailsIfMediaDataSourceThrows" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testExtractorGetCachedDuration" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testExtractorHasCacheReachedEndOfStream" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testFlacIdentity" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testFlacMovExtraction" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testFragmentedHttpRead" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testFragmentedRead" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testGetAudioPresentations" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testGetDrmInitData" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testMediaDataSourceIsClosedOnRelease" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testNullMediaDataSourceIsRejected" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testPcmBeInMov" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testPcmLeInMov" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testProgramStreamExtraction" />
-     <option name="compatibility:include-filter" value="CtsMediaDrmTestCases android.mediadrm.cts.MediaExtractorTest#testVideoPresentationTimeStampsMatch" />
-
-     <option name="compatibility:include-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testDeselectTrackForTimedTextTrack" />
-     <option name="compatibility:include-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testLocalVideo_cp1251_3_a_ms_acm_mp3" />
-     <option name="compatibility:include-filter" value="CtsMediaPlayerTestCases android.media.player.cts.MediaPlayerTest#testPlayMidi" />
-
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#test3gppMetadata" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testAlbumArtInOgg" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testBitsPerSampleAndSampleRate" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGenreParsing" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetEmbeddedPicture" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosest" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestEmptyNormalEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestSync" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestSyncEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestSyncEmptyNormalEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeNextSync" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeNextSyncEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeNextSyncEmptyNormalEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimePreviousSync" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimePreviousSyncEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFrameAtTimePreviousSyncEmptyNormalEditList" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetFramesAtIndex" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetImageAtIndex" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetScaledFrameAtTime" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testGetScaledFrameAtTimeWithInvalidResolutions" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testID3v230ExtHeader" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testID3v230ExtHeaderBigEndian" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testID3v240ExtHeader" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testID3v2Metadata" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testID3v2Unsynchronization" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testMediaDataSourceIsClosedOnRelease" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testMp4AlbumArt" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testNullMediaDataSourceIsRejected" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testRetrieveFailsIfMediaDataSourceReturnsAnError" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testRetrieveFailsIfMediaDataSourceThrows" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testSetDataSourceNullPath" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testSetDataSourceNullUri" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testSetDataSourcePath" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testSetDataSourceUri" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailAV1Hdr" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailH263" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailH264" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailHDR10" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailHEVC" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailMPEG4" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailVP8" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailVP9" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailVP9Hdr" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaMetadataRetrieverTest#testThumbnailWithRotation" />
-
-     <option name="compatibility:include-filter" value="CtsMediaAudioTestCases android.media.audio.cts.SoundPoolMidiTest#testLoad" />
-     <option name="compatibility:include-filter" value="CtsMediaAudioTestCases android.media.audio.cts.SoundPoolMidiTest#testSoundPoolOp" />
-
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacNoNumSamples" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4WithAc4" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithVariableBitrateAndXingHeader" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAdtsTruncatedWithConstantBitrateSeeking" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggBear" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testPsWithH262MpegAudio" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacNoSeekTableAndNoNumSamples" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testGetParserNamesByMimeType" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAdtsWithConstantBitrateSeeking" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testWavWithImaAdpcm" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAc3" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAc4" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlv" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testWav" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggBearFlac" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaSubsampleEncryptedNoAltref" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithSdt" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggOpusHeaderSniff" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH264MpegAudio" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAdts" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testEac3" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaOutOfBandCrypto" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH262MpegAudio" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4Fragmented" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH264DetectAccessUnits" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacWithPicture" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggBearVorbis" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testSetKnownParameters" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH264DtsAudio" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testSupportsParameter" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggFlacHeaderSniff" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH265" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithLatm" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testSetUnknownParameter" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithTrimmedSample" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaSubsampleEncryptedAltref" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggInvalidHeaderSniff" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaFullBlocks" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4FragmentedSei" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4Ac4Fragmented" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacNoMinMaxFrameSize" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4AndrdoidSlowMotion" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testGetParserNamesForUnsupportedMimeType" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacSample" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithId3" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAmrNarrowBandSamplesWithConstantBitrateSeeking" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacUncommonSampleRateFlac" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAmrWideBandSamplesWithConstantBitrateSeeking" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaFile" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAmrNarrowBandSamples" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacWithVorbisComments" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithNoSeekTableVariableBitrate" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testPsElphantsDream" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testLackOfSupportForUnsupportedParameter" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4FragmentedOutOfBandCrypto" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testGetAllParserNames" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacWithId3" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testAmrWideBandSamples" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithNoSeekTableVariableFrameSize" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4WithProtectedAc4" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testOggNoFlacSeekTable" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4MdatTooLong" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testMp4FragmentedSeekable" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testPsWithAc3" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testFlacOneMetadataBlock" />
-     <option name="compatibility:include-filter" value="CtsMediaParserTestCases android.media.mediaparser.cts.MediaParserTest#testCreationByName" />
-
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testAllControllersDisconnected_oneSession" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testGetSessions" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testOnGetSession_returnsSession" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testOnUpdateNotification" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testAddSessions_removedWhenClose" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testMediaNotification" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testAllControllersDisconnected_multipleSessions" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testOnGetSession_rejectsConnection" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testOnBind" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testOnGetSessionIsCalled" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2ServiceTest#testOnGetSession_returnsDifferentSessions" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testGetConnectedToken" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testCallback_onCommandResult" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testBuilder_setConnectionHints_withCustomParcelable" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testCreatingControllerWithoutCallback" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testCancelSessionCommand" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testCallback_onConnected_onDisconnected" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testBuilder_withIllegalArguments" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testBuilder_setConnectionHints_withFrameworkParcelable" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaController2Test#testCallback_onSessionCommand" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBuilder_setExtras_withCustomParcelable" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testSession2Token_writeToParcel" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBuilder_setExtras_withFrameworkParcelable" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBuilder_setSessionActivity" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testGetConnectedControllers_closedController" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testCallback_onPostConnect_connected" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testCallback_onCommandResult" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBuilder_setIllegalArguments" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBroadcastSessionCommand" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBuilder_createSessionWithDupId" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testBuilder_createSessionWithoutId" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testCancelSessionCommand" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testSession2Token" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testCallback_onPostConnect_rejected" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testSetPlaybackActive" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testSession2Token_extrasNotSet" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testGetConnectedControllers_newController" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testCallback_onSessionCommand" />
-     <option name="compatibility:include-filter" value="CtsMediaMiscTestCases android.media.misc.cts.MediaSession2Test#testCallback_onConnect_onDisconnect" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testAV1Decode30fps3840x2160" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testBFrames" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicH263" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicH264" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicHEVC" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicMpeg2" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicMpeg4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicVP8" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testCodecBasicVP9" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecode51M4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeAacTs" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeFlac" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeFlacMkv" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeFlacMp4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeFragmented" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeG711ChannelsAndRates" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeMonoGsm" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeMonoM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeMonoMp3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeMonoOgg" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeOgg" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeOpus" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeOpusChannelsAndRates" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeOpusMp4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeVorbis" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testDecodeWav" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testMpeg2Decode30fps1920x1080" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTest#testMpeg2Decode30fps1920x1080Tv" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcLevelM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcHeavyM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcFullM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacInternalClipM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcOutputLoudnessM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcOffM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcHalfM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.DecoderTestAacDrc#testDecodeAacDrcClipM4a" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaDrmClearkeyTest#testClearKeyPlaybackWebm" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testAC3inMP4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testAC3inTS" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testAC4inMP4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testAV1InMP4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testAdvance" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionInMP4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvav1" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvav1_2" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvavSe" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvheDtr" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvheSt" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testDolbyVisionMediaExtractorProfileDvheStn" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testEAC3inMP4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testEAC3inTS" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testExtractFromAMediaDataSource" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testExtractFromAssetFileDescriptor" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testExtractorFailsIfMediaDataSourceReturnsAnError" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testExtractorFailsIfMediaDataSourceThrows" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testExtractorGetCachedDuration" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testExtractorHasCacheReachedEndOfStream" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testFlacIdentity" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testFlacMovExtraction" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testFragmentedHttpRead" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testFragmentedRead" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testGetAudioPresentations" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testGetDrmInitData" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testMediaDataSourceIsClosedOnRelease" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testNullMediaDataSourceIsRejected" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testPcmBeInMov" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testPcmLeInMov" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaExtractorTest#testVideoPresentationTimeStampsMatch" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaPlayerTest#testDeselectTrackForTimedTextTrack" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaPlayerTest#testLocalVideo_cp1251_3_a_ms_acm_mp3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaPlayerTest#testPlayMidi" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#test3gppMetadata" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testAlbumArtInOgg" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testBitsPerSampleAndSampleRate" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGenreParsing" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetEmbeddedPicture" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosest" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestEmptyNormalEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestSync" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestSyncEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeClosestSyncEmptyNormalEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeNextSync" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeNextSyncEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimeNextSyncEmptyNormalEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimePreviousSync" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimePreviousSyncEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFrameAtTimePreviousSyncEmptyNormalEditList" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetFramesAtIndex" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetImageAtIndex" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetScaledFrameAtTime" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testGetScaledFrameAtTimeWithInvalidResolutions" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testID3v230ExtHeader" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testID3v230ExtHeaderBigEndian" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testID3v240ExtHeader" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testID3v2Metadata" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testID3v2Unsynchronization" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testMediaDataSourceIsClosedOnRelease" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testMp4AlbumArt" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testNullMediaDataSourceIsRejected" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testRetrieveFailsIfMediaDataSourceReturnsAnError" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testRetrieveFailsIfMediaDataSourceThrows" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testSetDataSourceNullPath" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testSetDataSourceNullUri" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testSetDataSourcePath" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testSetDataSourceUri" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailAV1Hdr" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailH263" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailH264" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailHDR10" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailHEVC" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailMPEG4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailVP8" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailVP9" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailVP9Hdr" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaMetadataRetrieverTest#testThumbnailWithRotation" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.SoundPoolMidiTest#testLoad" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.SoundPoolMidiTest#testSoundPoolOp" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacNoNumSamples" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4WithAc4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithVariableBitrateAndXingHeader" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAdtsTruncatedWithConstantBitrateSeeking" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggBear" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testPsWithH262MpegAudio" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacNoSeekTableAndNoNumSamples" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testGetParserNamesByMimeType" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAdtsWithConstantBitrateSeeking" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testWavWithImaAdpcm" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAc3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAc4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlv" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testWav" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggBearFlac" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaSubsampleEncryptedNoAltref" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithSdt" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggOpusHeaderSniff" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH264MpegAudio" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAdts" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testEac3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaOutOfBandCrypto" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH262MpegAudio" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4Fragmented" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH264DetectAccessUnits" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacWithPicture" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggBearVorbis" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testSetKnownParameters" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH264DtsAudio" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testSupportsParameter" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggFlacHeaderSniff" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithH265" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testTsWithLatm" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testSetUnknownParameter" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithTrimmedSample" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaSubsampleEncryptedAltref" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggInvalidHeaderSniff" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaFullBlocks" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4FragmentedSei" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4Ac4Fragmented" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacNoMinMaxFrameSize" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4AndrdoidSlowMotion" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testGetParserNamesForUnsupportedMimeType" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacSample" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithId3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAmrNarrowBandSamplesWithConstantBitrateSeeking" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacUncommonSampleRateFlac" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAmrWideBandSamplesWithConstantBitrateSeeking" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMatroskaFile" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAmrNarrowBandSamples" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacWithVorbisComments" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithNoSeekTableVariableBitrate" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testPsElphantsDream" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testLackOfSupportForUnsupportedParameter" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4FragmentedOutOfBandCrypto" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testGetAllParserNames" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacWithId3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testAmrWideBandSamples" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp3WithNoSeekTableVariableFrameSize" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4WithProtectedAc4" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testOggNoFlacSeekTable" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4MdatTooLong" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testMp4FragmentedSeekable" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testPsWithAc3" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testFlacOneMetadataBlock" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.mediaparser.cts.MediaParserTest#testCreationByName" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testAllControllersDisconnected_oneSession" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testGetSessions" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testOnGetSession_returnsSession" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testOnUpdateNotification" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testAddSessions_removedWhenClose" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testMediaNotification" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testAllControllersDisconnected_multipleSessions" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testOnGetSession_rejectsConnection" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testOnBind" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testOnGetSessionIsCalled" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2ServiceTest#testOnGetSession_returnsDifferentSessions" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testGetConnectedToken" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testCallback_onCommandResult" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testBuilder_setConnectionHints_withCustomParcelable" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testCreatingControllerWithoutCallback" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testCancelSessionCommand" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testCallback_onConnected_onDisconnected" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testBuilder_withIllegalArguments" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testBuilder_setConnectionHints_withFrameworkParcelable" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaController2Test#testCallback_onSessionCommand" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBuilder_setExtras_withCustomParcelable" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testSession2Token_writeToParcel" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBuilder_setExtras_withFrameworkParcelable" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBuilder_setSessionActivity" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testGetConnectedControllers_closedController" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testCallback_onPostConnect_connected" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testCallback_onCommandResult" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBuilder_setIllegalArguments" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBroadcastSessionCommand" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBuilder_createSessionWithDupId" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testBuilder_createSessionWithoutId" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testCancelSessionCommand" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testSession2Token" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testCallback_onPostConnect_rejected" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testSetPlaybackActive" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testSession2Token_extrasNotSet" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testGetConnectedControllers_newController" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testCallback_onSessionCommand" />
+     <option name="compatibility:include-filter" value="CtsMediaTestCases android.media.cts.MediaSession2Test#testCallback_onConnect_onDisconnect" />
 
      <!-- MediaProvider -->
      <option name="compatibility:include-filter" value="CtsScopedStorageHostTest android.scopedstorage.cts.host.ScopedStorageHostTest#testCallingIdentityCacheInvalidation" />
@@ -359,3 +353,4 @@
      <option name="compatibility:include-filter" value="MtsTimeZoneDataTestCases" />
 
 </configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
index df3112d..49d7649 100644
--- a/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
+++ b/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
@@ -21,16 +21,8 @@
     <!-- Include tests from statsd native device-tests -->
     <option name="compatibility:include-filter" value="statsd_test" />
 
-    <!-- Include framework statsd host tests -->
-    <!-- Exclude Statsd Framework Host tests until priv-app issue is resolved
-        TODO(b/222124237): remove once tests can run on userdebug build  -->
-    <!-- <option name="compatibility:include-filter" value="FrameworkStatsdHostTest" /> -->
-
     <!-- Enable MainlineTestModuleController. -->
     <option name="compatibility:module-arg" value="libstatspull_test:enable:true" />
     <option name="compatibility:module-arg" value="libstatssocket_test:enable:true" />
     <option name="compatibility:module-arg" value="statsd_test:enable:true" />
-    <!-- Exclude Statsd Framework Host tests until priv-app issue is resolved
-        TODO(b/222124237): remove once tests can run on userdebug build  -->
-    <!-- <option name="compatibility:module-arg" value="FrameworkStatsdHostTest:enable:true" /> -->
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-telephony.xml b/tools/mts-tradefed/res/config/mts-telephony.xml
index 8877345..f2e38ae 100644
--- a/tools/mts-tradefed/res/config/mts-telephony.xml
+++ b/tools/mts-tradefed/res/config/mts-telephony.xml
@@ -25,6 +25,7 @@
     <option name="compatibility:include-filter" value="CtsSimRestrictedApisTestCases" />
     <option name="compatibility:include-filter" value="CtsTelephony3TestCases" />
     <option name="compatibility:include-filter" value="CtsTelephony2TestCases" />
+    <option name="compatibility:include-filter" value="CtsTelephonySdk28TestCases" />
     <option name="compatibility:include-filter" value="CtsTelephonyTestCases" />
 
     <!-- TODO: Uncomment this after the instrumentation signature issue is resolved:
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
index 02d0723..bc1b18e 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
@@ -16,11 +16,9 @@
 <configuration description="List tests that need root access.">
     <include name="mts-adbd-tests-list-eng-only" />
     <include name="mts-art-tests-list-eng-only" />
-    <include name="mts-core-tests-list-eng-only" />
     <include name="mts-dnsresolver-tests-list-eng-only" />
     <include name="mts-documentsUI-usedapi-tests-list-eng-only" />
     <include name="mts-mediaprovider-tests-list-eng-only" />
     <include name="mts-statsd-tests-list-eng-only" />
-    <include name="mts-tethering-tests-list-eng-only" />
-    <include name="mts-uwb-tests-list-eng-only" />
 </configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
index f5d58f3..472bd69 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -14,31 +14,26 @@
      limitations under the License.
 -->
 <configuration description="List all tests that do not need root access in active test plans.">
-    <include name="mts-adservices-tests-list" />
-    <include name="mts-appsearch-tests-list" />
     <include name="mts-art-tests-list-user" />
     <include name="mts-cellbroadcast-oem-tests-list" />
     <include name="mts-conscrypt-tests-list" />
-    <include name="mts-core-tests-list-user" />
+    <include name="mts-core-tests-list" />
     <include name="mts-dnsresolver-tests-list-user" />
     <include name="mts-documentsUI-oem-tests-list" />
     <include name="mts-documentsUI-usedapi-tests-list" />
     <include name="mts-extservices-tests-list" />
-    <include name="mts-linkerconfig-tests-list" />
     <include name="mts-ipsec-tests-list" />
     <include name="mts-media-tests-list" />
     <include name="mts-mediaprovider-tests-list-user" />
     <include name="mts-network-tests-list" />
     <include name="mts-neuralnetworks-tests-list" />
-    <include name="mts-ondevicepersonalization-tests-list" />
     <include name="mts-permission-tests-list-oem" />
     <include name="mts-preload-verify-tests-list" />
     <include name="mts-scheduling-tests-list" />
     <include name="mts-sdkextensions-tests-list" />
     <include name="mts-statsd-tests-list-user" />
-    <include name="mts-tethering-tests-list-user" />
+    <include name="mts-tethering-tests-list" />
     <include name="mts-tzdata-tests-list" />
-    <include name="mts-uwb-tests-list-user" />
     <include name="mts-wifi-oem-tests-list" />
 
     <!-- Exclude Wifi GTS tests that cannot run on user build due to signature mismatch with GMSCore
diff --git a/tools/mts-tradefed/res/config/mts-tethering-coverage.xml b/tools/mts-tradefed/res/config/mts-tethering-coverage.xml
index fc6d36e..5d0a428 100644
--- a/tools/mts-tradefed/res/config/mts-tethering-coverage.xml
+++ b/tools/mts-tradefed/res/config/mts-tethering-coverage.xml
@@ -18,12 +18,6 @@
     <option name="plan" value="mts-tethering-coverage" />
 
     <option name="compatibility:include-filter" value="ConnectivityCoverageTests" />
-    <option name="compatibility:include-filter" value="NearbyUnitTests" />
-    <option name="compatibility:include-filter" value="CtsNearbyFastPairTestCases" />
-    <option name="compatibility:include-filter" value="netd_updatable_unit_test" />
-    <option name="compatibility:include-filter" value="libnetworkstats_test" />
-    <option name="compatibility:include-filter" value="traffic_controller_unit_test" />
-    <option name="compatibility:include-filter" value="libclat_test" />
 
     <!-- Coverage runs are significantly slower than normal runs, and testFuzzing cannot
          complete before the general test timeout (5 minutes) on such configurations. It is
diff --git a/tools/mts-tradefed/res/config/mts-tethering-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-tethering-tests-list-eng-only.xml
deleted file mode 100644
index e599533..0000000
--- a/tools/mts-tradefed/res/config/mts-tethering-tests-list-eng-only.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="List of tethering MTS tests that need root access.">
-    <option name="compatibility:include-filter" value="bpf_existence_test" />
-    <option name="compatibility:include-filter" value="connectivity_native_test" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-tethering-tests-list.xml
similarity index 64%
rename from tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml
rename to tools/mts-tradefed/res/config/mts-tethering-tests-list.xml
index 7e33ac1..913c130 100644
--- a/tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tethering-tests-list.xml
@@ -13,19 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="List of MTS tethering tests that do not need root acccess">
+<configuration description="List mts tethering tests">
 
-    <option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
     <option name="compatibility:include-filter" value="MtsTetheringTestLatestSdk" />
     <option name="compatibility:include-filter" value="CtsTetheringTestLatestSdk" />
-    <option name="compatibility:include-filter" value="NearbyUnitTests" />
-    <option name="compatibility:include-filter" value="CtsNearbyFastPairTestCases" />
 
     <!-- Enable tethering MTS tests to use MainlineTestModuleController -->
-    <option name="compatibility:module-arg" value="CtsNetTestCasesLatestSdk:enable:true" />
     <option name="compatibility:module-arg" value="MtsTetheringTestLatestSdk:enable:true" />
     <option name="compatibility:module-arg" value="CtsTetheringTestLatestSdk:enable:true" />
-    <option name="compatibility:module-arg" value="NearbyUnitTests:enable:true" />
-    <option name="compatibility:module-arg" value="CtsNearbyFastPairTestCases:enable:true" />
 </configuration>
 
diff --git a/tools/mts-tradefed/res/config/mts-tethering.xml b/tools/mts-tradefed/res/config/mts-tethering.xml
index 7d3943b..502e2df 100644
--- a/tools/mts-tradefed/res/config/mts-tethering.xml
+++ b/tools/mts-tradefed/res/config/mts-tethering.xml
@@ -17,15 +17,9 @@
 
     <include name="mts" />
 
-    <include name="mts-tethering-tests-list-user" />
-    <include name="mts-tethering-tests-list-eng-only" />
+    <include name="mts-tethering-tests-list" />
 
     <option name="plan" value="mts-tethering" />
 
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
-        <option name="property-name" value="ro.build.type" />
-        <option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
-        <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
-    </target_preparer>
 </configuration>
 
diff --git a/tools/mts-tradefed/res/config/mts-uwb-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-uwb-tests-list-eng-only.xml
deleted file mode 100644
index ac5e322..0000000
--- a/tools/mts-tradefed/res/config/mts-uwb-tests-list-eng-only.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<configuration description="List of UWB MTS tests that need root access.">
-    <option name="compatibility:include-filter" value="libuwb_uci_jni_rust_tests" />
-    <option name="compatibility:include-filter" value="libuwb_uci_packet_tests" />
-    <option name="compatibility:include-filter" value="libuwb_uci_rust_tests" />
-
-    <option name="compatibility:module-arg" value="libuwb_uci_jni_rust_tests:enable:true" />
-    <option name="compatibility:module-arg" value="libuwb_uci_packet_tests:enable:true" />
-    <option name="compatibility:module-arg" value="libuwb_uci_rust_tests:enable:true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-uwb-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-uwb-tests-list-user.xml
deleted file mode 100644
index 24eb4c2..0000000
--- a/tools/mts-tradefed/res/config/mts-uwb-tests-list-user.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<configuration description="List of UWB MTS tests that do not need root access.">
-    <option name="compatibility:include-filter" value="FrameworkUwbTests" />
-    <option name="compatibility:include-filter" value="ServiceUwbTests" />
-    <option name="compatibility:include-filter" value="CtsUwbTestCases" />
-
-    <option name="compatibility:module-arg" value="FrameworkUwbTests:enable:true" />
-    <option name="compatibility:module-arg" value="ServiceUwbTests:enable:true" />
-    <option name="compatibility:module-arg" value="CtsUwbTestCases:enable:true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-uwb.xml b/tools/mts-tradefed/res/config/mts-uwb.xml
deleted file mode 100644
index 68bde1c..0000000
--- a/tools/mts-tradefed/res/config/mts-uwb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs MTS-uwb from a pre-existing MTS installation">
-
-    <include name="mts" />
-
-    <include name="mts-uwb-tests-list-eng-only" />
-    <include name="mts-uwb-tests-list-user" />
-
-    <option name="plan" value="mts-uwb" />
-
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
-	<option name="property-name" value="ro.build.type" />
-	<option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
-	<option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
-    </target_preparer>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts.xml b/tools/mts-tradefed/res/config/mts.xml
index 2012e10..8180e81 100644
--- a/tools/mts-tradefed/res/config/mts.xml
+++ b/tools/mts-tradefed/res/config/mts.xml
@@ -51,10 +51,6 @@
 
     <!-- Advertise the test suite to media cts. -->
     <!-- TODO:delete after mts-all.xml is ready. -->
-    <option name="compatibility:module-arg" value="CtsMediaCodecTestCases:instrumentation-arg:mts-media:=true" />
-    <option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:instrumentation-arg:mts-media:=true" />
-    <option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:instrumentation-arg:mts-media:=true" />
-    <option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:instrumentation-arg:mts-media:=true" />
-    <option name="compatibility:module-arg" value="CtsMediaMiscTestCases:instrumentation-arg:mts-media:=true" />
-    <option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:instrumentation-arg:mts-media:=true" />
+    <option name="compatibility:module-arg" value="CtsMediaTestCases:instrumentation-arg:mts-media:=true" />
 </configuration>
+