diff --git a/tools/build/config.mk b/tools/build/config.mk
index 2416849..0849379 100644
--- a/tools/build/config.mk
+++ b/tools/build/config.mk
@@ -26,6 +26,7 @@
                documentsui \
                extservices \
                ipsec \
+               mainline-infra \
                media \
                mediaprovider \
                networking \
diff --git a/tools/mts-tradefed/Android.bp b/tools/mts-tradefed/Android.bp
index d1f185d..1c20ad5 100644
--- a/tools/mts-tradefed/Android.bp
+++ b/tools/mts-tradefed/Android.bp
@@ -22,7 +22,7 @@
     wrapper: "etc/mts-tradefed",
     short_name: "MTS",
     full_name: "Mainline Test Suite",
-    version: "2.0",
+    version: "3.0",
     static_libs: ["cts-tradefed-harness"],
     java_resource_dirs: ["res"],
 }
diff --git a/tools/mts-tradefed/res/config/collect-tests-only.xml b/tools/mts-tradefed/res/config/collect-tests-only.xml
new file mode 100644
index 0000000..995aca7
--- /dev/null
+++ b/tools/mts-tradefed/res/config/collect-tests-only.xml
@@ -0,0 +1,25 @@
+<?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 from pre-existing MTS installation">
+
+<option name="plan" value="collect-tests-only" />
+
+<include name="mts" />
+<include name="mts-tests-list-user" />
+<include name="mts-tests-list-eng-only" />
+
+<option name="compatibility:collect-tests-only" value="true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-appscheduling-tests-list.xml b/tools/mts-tradefed/res/config/mts-appscheduling-tests-list.xml
new file mode 100644
index 0000000..f47ba10
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-appscheduling-tests-list.xml
@@ -0,0 +1,29 @@
+<?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="MTS test list for Scheduling">
+
+    <option name="compatibility:include-filter" value="CtsAlarmManagerTestCases" />
+    <option name="compatibility:include-filter" value="CtsAppUsageHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsBatterySavingTestCases" />
+    <option name="compatibility:include-filter" value="CtsJobSchedulerTestCases" />
+
+    <!-- Enable Scheduling MTS tests to use MainlineTestModuleController -->
+    <option name="compatibility:module-arg" value="CtsAlarmManagerTestCases:enable:false" />
+    <option name="compatibility:module-arg" value="CtsAppUsageHostTestCases:enable:false" />
+    <option name="compatibility:module-arg" value="CtsBatterySavingTestCases:enable:false" />
+    <option name="compatibility:module-arg" value="CtsJobSchedulerTestCases:enable:false" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-appscheduling.xml b/tools/mts-tradefed/res/config/mts-appscheduling.xml
new file mode 100644
index 0000000..ef33a05
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-appscheduling.xml
@@ -0,0 +1,25 @@
+<?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-appscheduling from a pre-existing MTS installation">
+
+    <include name="mts" />
+
+    <option name="plan" value="mts-appscheduling" />
+
+    <include name="mts-appscheduling-tests-list" />
+
+</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 f33b8ed..ac8f442 100644
--- a/tools/mts-tradefed/res/config/mts-conscrypt-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-conscrypt-tests-list.xml
@@ -17,5 +17,10 @@
     <option name="compatibility:include-filter" value="CtsLibcoreOkHttpTestCases" />
     <option name="compatibility:include-filter" value="MtsConscryptTestCases" />
     <option name="compatibility:include-filter" value="MtsConscryptFdSocketTestCases" />
+
+    <!-- Enable Conscrypt MTS tests to use MainlineTestModuleController -->
+    <option name="compatibility:module-arg" value="CtsLibcoreOkHttpTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="MtsConscryptTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="MtsConscryptFdSocketTestCases:enable:true" />
 </configuration>
 
diff --git a/tools/mts-tradefed/res/config/mts-documentsUI-usedapi-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-documentsUI-usedapi-tests-list-eng-only.xml
new file mode 100644
index 0000000..ee004bd
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-documentsUI-usedapi-tests-list-eng-only.xml
@@ -0,0 +1,20 @@
+<?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 MTS api tests used by documentsUI that needs root access.">
+  <option name="compatibility:include-filter" value="CtsOsTestCases android.os.cts.AsyncTaskTest#testException" />
+  <option name="compatibility:include-filter" value="CtsOsTestCases android.os.cts.AsyncTaskTest#testCancellationWithException" />
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-documentsUI-usedapi-tests-list.xml b/tools/mts-tradefed/res/config/mts-documentsUI-usedapi-tests-list.xml
new file mode 100644
index 0000000..492f3d3
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-documentsUI-usedapi-tests-list.xml
@@ -0,0 +1,22 @@
+<?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 MTS api tests used by documentsUI.">
+    <option name="compatibility:include-filter" value="CtsContentTestCases android.content.cts.ContextTest#testCreatePackageContextAsUser" />
+    <option name="compatibility:include-filter" value="CtsContentTestCases android.content.cts.ContextTest#testStartActivityAsUser" />
+    <option name="compatibility:include-filter" value="CtsProviderTestCases android.provider.cts.DocumentsContractTest#testGetDocumentThumbnail" />
+    <option name="compatibility:include-filter" value="CtsProviderTestCases android.provider.cts.DocumentsContractTest#testManageMode" />
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-exclude.xml b/tools/mts-tradefed/res/config/mts-exclude.xml
index 2d6da72..a0c4b27 100644
--- a/tools/mts-tradefed/res/config/mts-exclude.xml
+++ b/tools/mts-tradefed/res/config/mts-exclude.xml
@@ -154,28 +154,13 @@
     <!-- b/142978584: Flaky test -->
     <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.TrafficStatsTest#testTrafficStatsForLocalhost" />
 
-    <!-- https://b.corp.google.com/hotlists/2163903 Flaky test for DNS resolver-->
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryInline" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testPrivateDnsBypass" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryNXDomainInlineWithPrivateDns" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryRootInline" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryRoot" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testQueryForInetAddressInline" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsTest#testDnsWorks" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryNXDomainInlineWithPrivateDns" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testQueryForInetAddressIpv4" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testContinuousQueries" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testContinuousQueriesInline" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryNXDomainWithPrivateDns" />
-    <option name="compatibility:exclude-filter" value="CtsNetTestCases  android.net.cts.DnsResolverTest#testRawQueryNXDomain" />
-
     <!-- b/148478158, b/148478370, b/148476965 Flaky test for Conscrypt-->
     <option name="compatibility:exclude-filter" value="CtsLibcoreOjTestCases  test.java.time.chrono.TestJapaneseChronoImpl#test_dayOfYearVsCalendar" />
     <option name="compatibility:exclude-filter" value="CtsLibcoreOjTestCases  tck.java.time.chrono.TCKJapaneseChronology#test_getDayOfYear" />
     <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases  org.apache.harmony.tests.javax.net.ssl.SSLSocketTest#testConstructor_InetAddressI" />
 
     <!-- https://b.corp.google.com/hotlists/2163643 Flaky test for statsd-->
-    <option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests#testAppOps" />
+    <option name="compatibility:exclude-filter" value="CtsStatsdAtomHostTestCases android.cts.statsdatom.appops.AppOpsTests#testAppOps" />
     <option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests$#testForegroundServiceAccessAppOp" />
     <option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests#testMobileBytesTransfer" />
     <option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests#testMobileBytesTransferByFgBg" />
@@ -237,9 +222,6 @@
     <!-- b/144590380: MTS flaky test -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeMediaDrmClearkeyTest#testClearKeyPlaybackCenc2" />
 
-    <!-- b/143245993: MTS flaky test -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeMediaDrmClearkeyTest#testPssh" />
-
     <!-- b/142965402: MTS flaky test -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
 
diff --git a/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
index 031628b..3db2066 100644
--- a/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
@@ -20,8 +20,6 @@
         <option name="teardown-command" value="device_config delete textclassifier textclassifier_service_package_override" />
     </target_preparer>
 
-    <!-- for Notification -->
-    <option name="compatibility:include-filter" value="CtsLegacyNotification29TestCases" />
     <!-- for Watchdog -->
     <option name="compatibility:include-filter" value="CtsPackageWatchdogTestCases" />
     <!-- for TextClassifier -->
@@ -33,14 +31,19 @@
 
     <!-- for TextClassifier native -->
     <option name="compatibility:include-filter" value="libtextclassifier_tests" />
+    <option name="compatibility:include-filter" value="libtextclassifier_java_tests" />
+
+    <!-- for Displayhash native -->
+    <option name="compatibility:include-filter" value="libextservices_test" />
 
     <!-- Enable MainlineTestModuleController. -->
     <option name="compatibility:module-arg" value="CtsPackageWatchdogTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="CtsLegacyNotification29TestCases:enable:true" />
     <option name="compatibility:module-arg" value="CtsTextClassifierTestCases:enable:true" />
     <option name="compatibility:module-arg" value="ExtServicesUnitTests:enable:true" />
     <option name="compatibility:module-arg" value="TextClassifierNotificationTests:enable:true" />
     <option name="compatibility:module-arg" value="TextClassifierServiceTest:enable:true" />
     <option name="compatibility:module-arg" value="libtextclassifier_tests:enable:true" />
+    <option name="compatibility:module-arg" value="libtextclassifier_java_tests:enable:true" />
+    <option name="compatibility:module-arg" value="libextservices_test:enable:true" />
 
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-mainline-infra-tests-list.xml b/tools/mts-tradefed/res/config/mts-mainline-infra-tests-list.xml
new file mode 100644
index 0000000..a29233a
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-mainline-infra-tests-list.xml
@@ -0,0 +1,24 @@
+<?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-mainline-infra from a pre-existing MTS installation">
+
+    <option name="compatibility:include-filter"
+            value="CtsAppSecurityHostTestCases android.appsecurity.cts.ResumeOnRebootHostTest" />
+    <!-- b/181930359 -->
+    <option name="compatibility:exclude-filter"
+            value="CtsAppSecurityHostTestCases android.appsecurity.cts.ResumeOnRebootHostTest#resumeOnReboot_ManagedProfile_Success" />
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-mainline-infra.xml b/tools/mts-tradefed/res/config/mts-mainline-infra.xml
new file mode 100644
index 0000000..5f9de70
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-mainline-infra.xml
@@ -0,0 +1,27 @@
+<?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-mainline-infra from a pre-existing MTS installation">
+
+    <include name="mts" />
+
+    <include name="mts-mainline-infra-tests-list" />
+
+    <option name="enable-root" value="false" />
+    <option name="compatibility:primary-abi-only" value="true" />
+    <option name="plan" value="mts-mainline-infra" />
+
+</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 0622a3a..de12b6b 100644
--- a/tools/mts-tradefed/res/config/mts-media-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-media-tests-list.xml
@@ -23,7 +23,7 @@
     <!--b/138964734-->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
 
-    <!--Tests from CTS known faliures-->
+    <!--Tests from CTS known failures-->
 
     <!-- b/38224690 -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeEncoderTest" />
diff --git a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list.xml b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-eng-only.xml
similarity index 67%
rename from tools/mts-tradefed/res/config/mts-mediaprovider-tests-list.xml
rename to tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-eng-only.xml
index 0ab4eea..3662a65 100644
--- a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-eng-only.xml
@@ -13,20 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="MTS test list for Mediaprovider.">
+<configuration description="MTS test list for Mediaprovider root tests.">
 
-    <option name="compatibility:include-filter" value="CtsProviderTestCases android.provider.cts.media." />
     <option name="compatibility:include-filter" value="fuse_node_test" />
-    <option name="compatibility:include-filter" value="CtsScopedStorageHostTest" />
-    <option name="compatibility:include-filter" value="MediaProviderTests" />
     <option name="compatibility:include-filter" value="FuseUtilsTest" />
     <option name="compatibility:include-filter" value="RedactionInfoTest" />
 
     <!-- Enable Mediaprovider MTS tests to use MainlineTestModuleController -->
-    <option name="compatibility:module-arg" value="CtsProviderTestCases:enable:true" />
     <option name="compatibility:module-arg" value="fuse_node_test:enable:true" />
-    <option name="compatibility:module-arg" value="CtsScopedStorageHostTest:enable:true" />
-    <option name="compatibility:module-arg" value="MediaProviderTests:enable:true" />
     <option name="compatibility:module-arg" value="FuseUtilsTest:enable:true" />
     <option name="compatibility:module-arg" value="RedactionInfoTest:enable:true" />
 
diff --git a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
new file mode 100644
index 0000000..944ead0
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
@@ -0,0 +1,36 @@
+<?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="MTS test list for Mediaprovider tests not need root access.">
+
+    <option name="compatibility:include-filter" value="CtsProviderTestCases android.provider.cts.media." />
+    <option name="compatibility:include-filter" value="CtsScopedStorageCoreHostTest" />
+    <option name="compatibility:include-filter" value="CtsScopedStorageHostTest" />
+    <option name="compatibility:include-filter" value="CtsScopedStorageDeviceOnlyTest" />
+    <!-- TODO(b/184232207) Enable CtsScopedStoragePublicVolumeHostTest in MTS when it is stable -->
+    <!-- <option name="compatibility:include-filter" value="CtsScopedStoragePublicVolumeHostTest" /> -->
+    <option name="compatibility:include-filter" value="CtsAppCloningHostTest" />
+    <option name="compatibility:include-filter" value="MediaProviderTests" />
+
+    <!-- Enable Mediaprovider MTS tests to use MainlineTestModuleController -->
+    <!-- MainlineTestModuleController is disabled for CtsProviderTestCases because the test is shared by DocumentUI (Q-intro module) and MediaProvider -->
+    <option name="compatibility:module-arg" value="CtsScopedStorageCoreHostTest:enable:true" />
+    <option name="compatibility:module-arg" value="CtsScopedStorageHostTest:enable:true" />
+    <option name="compatibility:module-arg" value="CtsScopedStorageDeviceOnlyTest:enable:true" />
+    <!-- <option name="compatibility:module-arg" value="CtsScopedStoragePublicVolumeHostTest:enable:true" /> -->
+    <option name="compatibility:module-arg" value="CtsAppCloningHostTest:enable:true" />
+    <option name="compatibility:module-arg" value="MediaProviderTests:enable:true" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-mediaprovider.xml b/tools/mts-tradefed/res/config/mts-mediaprovider.xml
index ee51472..ecbcaa2 100644
--- a/tools/mts-tradefed/res/config/mts-mediaprovider.xml
+++ b/tools/mts-tradefed/res/config/mts-mediaprovider.xml
@@ -17,7 +17,8 @@
 
     <include name="mts" />
 
-    <include name="mts-mediaprovider-tests-list" />
+    <include name="mts-mediaprovider-tests-list-user" />
+    <include name="mts-mediaprovider-tests-list-eng-only" />
 
     <option name="plan" value="mts-mediaprovider" />
 
diff --git a/tools/mts-tradefed/res/config/mts-metrics-tests-list.xml b/tools/mts-tradefed/res/config/mts-metrics-tests-list.xml
new file mode 100644
index 0000000..5f9ca6f
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-metrics-tests-list.xml
@@ -0,0 +1,18 @@
+<?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="List mts metrics tests that do not need root access">
+    <option name="compatibility:include-filter" value="TrainInstallWithManualRebootSuccessTest" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-metrics.xml b/tools/mts-tradefed/res/config/mts-metrics.xml
new file mode 100644
index 0000000..70740a0
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-metrics.xml
@@ -0,0 +1,24 @@
+<?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="Runs MTS-metrics from a pre-existing MTS installation">
+
+    <include name="mts" />
+
+    <include name="mts-metrics-tests-list" />
+
+    <option name="plan" value="mts-metrics" />
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-permission-oem.xml b/tools/mts-tradefed/res/config/mts-permission-oem.xml
new file mode 100644
index 0000000..4a304d3
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-permission-oem.xml
@@ -0,0 +1,26 @@
+<?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-Permission from a pre-existing MTS installation for OEM">
+
+    <include name="mts" />
+
+    <include name="mts-permission-tests-list-oem" />
+
+    <option name="plan" value="mts-permission-oem" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-permission-tests-list-internal.xml b/tools/mts-tradefed/res/config/mts-permission-tests-list-internal.xml
new file mode 100644
index 0000000..596eb0a
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-permission-tests-list-internal.xml
@@ -0,0 +1,21 @@
+<?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 MTS permission tests for internal.">
+    <option name="compatibility:include-filter" value="GooglePermissionControllerInProcessTests" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-permission-tests-list.xml b/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
similarity index 62%
rename from tools/mts-tradefed/res/config/mts-permission-tests-list.xml
rename to tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
index 3d99389..e9b8472 100644
--- a/tools/mts-tradefed/res/config/mts-permission-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
@@ -16,11 +16,15 @@
   ~ limitations under the License.
   -->
 
-<configuration description="List MTS permission tests.">
+<configuration description="List MTS permission tests for OEM.">
+    <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="CtsPermissionTestCases android.permission.cts.BackgroundPermissionsTest" />
-    <!-- TODO(b/153907603): LocationAccessCheckTest clears package data for PermissionController which will interfere with coverage collection. -->
-    <!--<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.LocationAccessCheckTest" />-->
+    <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.LocationAccessCheckTest" />
+    <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" />
     <option name="compatibility:module-arg" value="CtsPermissionTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
     <option name="compatibility:include-filter" value="CtsPermission3TestCases" />
     <option name="compatibility:module-arg" value="CtsPermission3TestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
@@ -29,6 +33,11 @@
     <option name="compatibility:include-filter" value="CtsDevicePolicyManagerTestCases" />
     <option name="compatibility:module-arg" value="CtsDevicePolicyManagerTestCases:include-annotation:com.android.cts.devicepolicy.annotations.PermissionsTest" />
     <option name="compatibility:module-arg" value="CtsDevicePolicyManagerTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
+    <option name="compatibility:include-filter" value="CtsOsTestCases android.os.cts.AutoRevokeTest" />
+    <option name="compatibility:include-filter" value="CtsOsTestCases android.os.cts.AppHibernationIntegrationTest" />
+    <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="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-permission.xml b/tools/mts-tradefed/res/config/mts-permission.xml
index 2ca0bd0..0e6a062 100644
--- a/tools/mts-tradefed/res/config/mts-permission.xml
+++ b/tools/mts-tradefed/res/config/mts-permission.xml
@@ -20,7 +20,8 @@
 
     <include name="mts" />
 
-    <include name="mts-permission-tests-list" />
+    <include name="mts-permission-tests-list-internal" />
+    <include name="mts-permission-tests-list-oem" />
 
     <option name="plan" value="mts-permission" />
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-scheduling-tests-list.xml b/tools/mts-tradefed/res/config/mts-scheduling-tests-list.xml
new file mode 100644
index 0000000..a61a756
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-scheduling-tests-list.xml
@@ -0,0 +1,25 @@
+<?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="MTS test list for Device Scheduling">
+
+  <option name="compatibility:include-filter" value="CtsRebootReadinessTestCases" />
+  <option name="compatibility:include-filter" value="RebootReadinessUnitTests" />
+
+  <!-- Enable Device Scheduling MTS tests to use MainlineTestModuleController -->
+  <option name="compatibility:module-arg" value="CtsRebootReadinessTestCases:enable:true" />
+  <option name="compatibility:module-arg" value="RebootReadinessUnitTests:enable:true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-scheduling.xml b/tools/mts-tradefed/res/config/mts-scheduling.xml
new file mode 100644
index 0000000..ad7fbbd
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-scheduling.xml
@@ -0,0 +1,25 @@
+<?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-scheduling from a pre-existing MTS installation">
+
+  <include name="mts" />
+
+  <option name="plan" value="mts-scheduling" />
+
+  <include name="mts-scheduling-tests-list" />
+
+</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
new file mode 100644
index 0000000..a061042
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-smoke-tests-list.xml
@@ -0,0 +1,356 @@
+<?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 MTS smoke tests.">
+
+     <!-- adbd -->
+     <option name="compatibility:include-filter" value="adbd_test" />
+
+     <!-- Cell Broadcast -->
+     <option name="compatibility:include-filter" value="CellBroadcastReceiverOemUnitTests" />
+     <option name="compatibility:include-filter" value="CellBroadcastServiceTests" />
+
+     <!-- Conscrypt -->
+     <option name="compatibility:include-filter" value="MtsConscryptTestCases com.android.org.conscrypt.java.security.SignatureTest" />
+
+     <!-- DNS Resolver -->
+     <option name="compatibility:include-filter" value="CtsNativeNetDnsTestCases" />
+     <option name="compatibility:include-filter" value="resolv_unit_test" />
+     <option name="compatibility:include-filter" value="resolv_integration_test" />
+     <option name="compatibility:include-filter" value="resolv_gold_test" />
+     <option name="compatibility:include-filter" value="resolv_stress_test" />
+
+     <!-- DocumentsUI -->
+     <option name="compatibility:include-filter" value="DocumentsUIGoogleTests com.android.documentsui.FileCopyUiTest#testCopyDocuments_FromSdCard"/>
+     <option name="compatibility:include-filter" value="DocumentsUIGoogleTests com.android.documentsui.FileCopyUiTest#testCopyDocuments_ToSdCard"/>
+     <option name="compatibility:include-filter" value="DocumentsUIUnitTests com.android.documentsui.files.ActionHandlerTest#testDocumentPicked_Recent_ManagesApks"/>
+     <option name="compatibility:include-filter" value="DocumentsUIUnitTests com.android.documentsui.RecentsLoaderTests#testContentsUpdate_observable"/>
+
+     <!-- ExtServices -->
+     <option name="compatibility:module-arg" value="CtsPackageWatchdogTestCases:enable:true" />
+     <option name="compatibility:module-arg" value="CtsTextClassifierTestCases:enable:true" />
+     <option name="compatibility:module-arg" value="ExtServicesUnitTests:enable:true" />
+     <option name="compatibility:module-arg" value="TextClassifierNotificationTests:enable:true" />
+     <option name="compatibility:module-arg" value="TextClassifierServiceTest:enable:true" />
+     <option name="compatibility:module-arg" value="libtextclassifier_tests:enable:true" />
+
+     <!-- IPsec -->
+     <option name="compatibility:include-filter" value="FrameworksIkeTests" />
+     <option name="compatibility:include-filter" value="CtsIkeTestCases" />
+
+     <!-- Media -->
+     <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" />
+
+     <!-- Network -->
+     <option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
+
+     <!-- NeuralNetworks -->
+     <option name="compatibility:include-filter" value="CtsNNAPIBenchmarkTestCases" />
+     <option name="compatibility:include-filter" value="CtsTfliteNnapiDelegateTestCases" />
+
+     <!-- Permission -->
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#addAndRemoveRoleHolderThenRoleIsNotHeld" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestRoleFirstTimeNoDontAskAgain" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#addAndRemoveRoleHolderThenIsNotRoleHolder" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestRoleAndDenyWithDontAskAgainReturnsCanceled" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#roleIsAvailable" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#addRoleHolderThenIsRoleHolder" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppListAndSetDefaultAppThenIsDefaultApp" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestHoldingRoleThenAllowedAutomatically" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestUnqualifiedRoleThenDeniedAutomatically" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestRoleAndAllowThenIsRoleHolder" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#addRoleHolderThenRoleIsHeld" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestRoleAndDenyThenHasDontAskAgain" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppDetailsAndSetDefaultAppThenIsDefaultApp" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppDetailsAndSetDefaultAppAndSetAnotherThenIsNotDefaultApp" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppDetailsThenIsNotDefaultApp" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#addAndClearRoleHoldersThenIsNotRoleHolder" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppListAndSetDefaultAppThenIsDefaultAppInList" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#dontAddRoleHolderThenIsNotRoleHolder" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#openDefaultAppListThenHasDefaultApp" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestRoleAndDenyThenIsNotRoleHolder" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#requestRoleAndDenyWithDontAskAgainThenDeniedAutomatically" />
+     <option name="compatibility:include-filter" value="CtsRoleTestCases android.app.role.cts.RoleManagerTest#dontAddRoleHolderThenRoleIsNotHeld" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testRequestNonRuntimePermission" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testNullAndRealPermission" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testCancelledPermissionRequest" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testInvalidPermission" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testDefault" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testNullPermissionRequest" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testRuntimeGroupGrantSpecificity" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testRequestGrantedPermission" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testRequestPermissionFromTwoGroups" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testInteractiveGrant" />
+     <option name="compatibility:include-filter" value="CtsPermission3TestCases	android.permission3.cts.PermissionTest23#testRequestNonExistentPermission" />
+
+
+     <!-- SDKExtensions -->
+     <option name="compatibility:include-filter" value="CtsSdkExtensionsTestCases" />
+
+     <!-- Statsd -->
+     <option name="compatibility:include-filter" value="FrameworkStatsdTest" />
+     <option name="compatibility:include-filter" value="libstatspull_test" />
+     <option name="compatibility:include-filter" value="libstatssocket_test" />
+
+     <!-- Tethering and Wifi -->
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.aware.cts.SingleDeviceTest#testSubscribeDiscoverySuccess" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.aware.cts.SingleDeviceTest#testPublishDiscoverySuccess" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiBackupRestoreTest#testRestoreFromV1_0BackupFormat" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiBackupRestoreTest#testCanRestoreBackupData" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiBackupRestoreTest#testRestoreFromV1_1BackupFormat" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiBackupRestoreTest#testRestoreFromV1_2BackupFormat" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiBackupRestoreTest#testRestoreFromLegacyBackupFormat" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiBackupRestoreTest#testCanRestoreSoftApBackupData" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiConfigurationTest#testWifiConfiguration" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiManagerTest#testForget" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiManagerTest#testWifiManagerScanWhenWifiOffLocationTurnedOn" />
+     <option name="compatibility:include-filter" value="CtsWifiTestCases android.net.wifi.cts.WifiManagerTest#testConnectWithNetworkId" />
+     <option name="compatibility:include-filter" value="GtsGmscoreHostTestCases com.google.android.gts.wifi.WifiHostTest#testWifiScannerOneShotChannels" />
+
+     <!-- Timezone -->
+     <option name="compatibility:include-filter" value="MtsTimeZoneDataTestCases" />
+
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-smoke.xml b/tools/mts-tradefed/res/config/mts-smoke.xml
new file mode 100644
index 0000000..6915de7
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-smoke.xml
@@ -0,0 +1,25 @@
+<?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-smoke tests from a pre-existing MTS installation">
+
+    <include name="mts" />
+
+    <include name="mts-smoke-tests-list" />
+
+    <option name="plan" value="mts-smoke" />
+
+</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 0712910..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
@@ -18,14 +18,10 @@
     <option name="compatibility:include-filter" value="libstatspull_test" />
     <option name="compatibility:include-filter" value="libstatssocket_test" />
 
-    <!-- Include libincident tests -->
-    <option name="compatibility:include-filter" value="libincident_test" />
-
     <!-- Include tests from statsd native device-tests -->
     <option name="compatibility:include-filter" value="statsd_test" />
 
     <!-- Enable MainlineTestModuleController. -->
-    <option name="compatibility:module-arg" value="libincident_test:enable:true" />
     <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" />
diff --git a/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
index d9628e0..db4880b 100644
--- a/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
@@ -16,6 +16,7 @@
 <configuration description="List of statsd MTS tests that do not need root access.">
     <!-- Include tests from CTS -->
     <option name="compatibility:include-filter" value="CtsStatsdHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsUtilTestCases android.util.cts.AndroidExceptionTest#testAndroidException" />
 
     <!-- Include tests from Statsd Framework Apex -->
     <option name="compatibility:include-filter" value="FrameworkStatsdTest" />
@@ -25,6 +26,8 @@
 
     <!-- Enable MainlineTestModuleController. -->
     <option name="compatibility:module-arg" value="CtsStatsdHostTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="CtsUtilTestCases:enable:true" />
     <option name="compatibility:module-arg" value="FrameworkStatsdTest:enable:true" />
     <option name="compatibility:module-arg" value="GtsStatsdHostTestCases:enable:true" />
+
 </configuration>
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 9580187..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
@@ -17,6 +17,8 @@
     <include name="mts-adbd-tests-list-eng-only" />
     <include name="mts-art-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" />
 </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 bd977e0..472bd69 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -17,19 +17,24 @@
     <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" />
     <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-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-permission-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" />
     <include name="mts-tzdata-tests-list" />
-    <include name="mts-wifi-tests-list" />
+    <include name="mts-wifi-oem-tests-list" />
 
     <!-- Exclude Wifi GTS tests that cannot run on user build due to signature mismatch with GMSCore
          TODO(b/158818152): remove once GTS tests can run on user build  -->
@@ -37,8 +42,12 @@
     <option name="compatibility:exclude-filter" value="GtsBackupHostTestCases" />
 
     <!-- Exclude Statsd GTS tests that cannot run on user build due to signature mismatch with
-         GMSCore
-         TODO(b/158818152): remove once GTS tests can run on user build  -->
+        GMSCore
+        TODO(b/158818152): remove once GTS tests can run on user build  -->
     <option name="compatibility:exclude-filter" value="GtsStatsdHostTestCases" />
-</configuration>
 
+    <!-- Exclude Permission GTS tests that cannot run on user build due to signature mismatch with
+        GMSCore
+        TODO(b/158818152): remove once GTS tests can run on user build  -->
+    <option name="compatibility:exclude-filter" value="GtsIncidentManagerTestCases" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-user.xml b/tools/mts-tradefed/res/config/mts-user.xml
index d8ab57f..79704ba 100644
--- a/tools/mts-tradefed/res/config/mts-user.xml
+++ b/tools/mts-tradefed/res/config/mts-user.xml
@@ -16,6 +16,8 @@
 <configuration description="Config to run MTS tests on user builds.">
     <include name="mts" />
 
+    <option name="enable-root" value="false" />
+
     <include name="mts-tests-list-user" />
 
     <option name="plan" value="mts-user" />
diff --git a/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml b/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
new file mode 100644
index 0000000..77cfad3
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
@@ -0,0 +1,36 @@
+<?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 test modules of WIFI module. This is a placeholder xml instead of a runnable plan.">
+
+    <option name="compatibility:include-filter" value="MtsWifiTestCases" />
+    <option name="compatibility:include-filter" value="CtsWifiTestCases" />
+    <option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
+    <option name="compatibility:include-filter"
+            value="GtsGmscoreHostTestCases com.google.android.gts.wifi.WifiHostTest" />
+    <option name="compatibility:include-filter"
+            value="GtsBackupHostTestCases com.google.android.gts.backup.OldWifiSettingsRestoreHostSideTest" />
+    <option name="compatibility:include-filter"
+            value="GtsBackupHostTestCases com.google.android.gts.backup.WifiSettingsBackupHostSideTest" />
+    <option name="compatibility:include-filter"
+            value="GtsBackupHostTestCases com.google.android.gts.backup.WifiSettingsRestoreHostSideTest" />
+
+    <!-- Enable WIFI MTS tests to use MainlineTestModuleController -->
+    <option name="compatibility:module-arg" value="MtsWifiTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="GtsBackupHostTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="GtsGmscoreHostTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="CtsWifiTestCases:enable:true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-wifi-oem.xml b/tools/mts-tradefed/res/config/mts-wifi-oem.xml
new file mode 100644
index 0000000..1269b27
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-wifi-oem.xml
@@ -0,0 +1,26 @@
+<?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="Runs MTS-wifi from a pre-existing MTS installation for OEMs">
+
+    <include name="mts" />
+
+    <include name="mts-wifi-oem-tests-list" />
+
+    <option name="plan" value="mts-wifi-oem" />
+
+    <option name="compatibility:primary-abi-only" value="true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-wifi-tests-list.xml b/tools/mts-tradefed/res/config/mts-wifi-tests-list.xml
index 5edbe55..4898162 100644
--- a/tools/mts-tradefed/res/config/mts-wifi-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-wifi-tests-list.xml
@@ -15,33 +15,11 @@
 -->
 
 <configuration description="List test modules of WIFI module. This is a placeholder xml instead of a runnable plan.">
-    <!-- This test is only run if the Wifi module is installed. It tests for functionality that is
-         not required for devices that don't take the Wifi module. -->
-    <option name="compatibility:include-filter" value="MtsWifiTestCases" />
+    <include name="mts-wifi-oem-tests-list" />
 
     <option name="compatibility:include-filter" value="FrameworksWifiApiTests" />
     <option name="compatibility:include-filter" value="FrameworksWifiTests" />
 
-    <!-- These tests are run no matter if the Wifi module is installed or not, since these are
-         CTS/GTS tests that should pass regardless.
-         Note: Gating these tests by whether the Wifi Module is installed will gate their entire
-         test suites, which is not desirable since other tests in the suite are used to qualify
-         mandatory modules. -->
-    <option name="compatibility:include-filter" value="CtsWifiTestCases" />
-    <option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
-    <option name="compatibility:include-filter"
-            value="GtsGmscoreHostTestCases com.google.android.gts.wifi.WifiHostTest" />
-    <option name="compatibility:include-filter"
-            value="GtsBackupHostTestCases com.google.android.gts.backup.OldWifiSettingsRestoreHostSideTest" />
-    <option name="compatibility:include-filter"
-            value="GtsBackupHostTestCases com.google.android.gts.backup.WifiSettingsBackupHostSideTest" />
-    <option name="compatibility:include-filter"
-            value="GtsBackupHostTestCases com.google.android.gts.backup.WifiSettingsRestoreHostSideTest" />
-
-    <!-- Enable MainlineTestModuleController for Wifi MTS-only tests -->
-    <option name="compatibility:module-arg" value="MtsWifiTestCases:enable:true" />
     <option name="compatibility:module-arg" value="FrameworksWifiApiTests:enable:true" />
     <option name="compatibility:module-arg" value="FrameworksWifiTests:enable:true" />
-    <option name="compatibility:module-arg" value="GtsBackupHostTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="GtsGmscoreHostTestCases:enable:true" />
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts.xml b/tools/mts-tradefed/res/config/mts.xml
index 35d0a08..8180e81 100644
--- a/tools/mts-tradefed/res/config/mts.xml
+++ b/tools/mts-tradefed/res/config/mts.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Runs MTS">
+<configuration description="Runs all the tests in MTS">
 
     <include name="everything" />
     <option name="plan" value="mts" />