Snap for 11268588 from 5ea5512466b1394c7f1939ae26f349259fa92450 to mainline-art-release
Change-Id: I7d5aafe6bcde82258f45040b83c3e83b1b847204
diff --git a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
index aec5c3a..99e2545 100644
--- a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
@@ -22,6 +22,7 @@
<option name="compatibility:include-filter" value="AdServicesManagerServiceTests" />
<option name="compatibility:include-filter" value="AdServicesMddIntegrationTests" />
<option name="compatibility:include-filter" value="AdServicesServiceCoreUnitTests" />
+ <option name="compatibility:include-filter" value="AdServicesServiceCoreMeasurementUnitTests" />
<option name="compatibility:include-filter" value="CtsAdIdEndToEndTest" />
<option name="compatibility:include-filter" value="CtsAdServicesDebuggableDeviceTestCases" />
<option name="compatibility:include-filter" value="CtsAdServicesDeviceTestCases" />
@@ -61,6 +62,7 @@
<option name="compatibility:module-arg" value="AdServicesManagerServiceTests:enable:true" />
<option name="compatibility:module-arg" value="AdServicesMddIntegrationTests:enable:true" />
<option name="compatibility:module-arg" value="AdServicesServiceCoreUnitTests:enable:true" />
+ <option name="compatibility:module-arg" value="AdServicesServiceCoreMeasurementUnitTests:enable:true" />
<option name="compatibility:module-arg" value="CtsAdIdEndToEndTest:enable:true" />
<option name="compatibility:module-arg" value="CtsAdServicesDebuggableDeviceTestCases:enable:true" />
<option name="compatibility:module-arg" value="CtsAdServicesDeviceTestCases:enable:true" />
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
index 4162d23..2e0642f 100644
--- a/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
@@ -23,6 +23,10 @@
with the latest version of that module installed -->
<option name="compatibility:module-arg"
value="CtsNetTestCasesLatestSdk:exclude-annotation:com.android.testutils.ConnectivityModuleTest" />
+ <!-- Temporary solution which equal to aosp/2861373. To skip the test require the latest
+ connectivity module-->
+ <option name="compatibility:exclude-filter"
+ value="CtsNetTestCasesLatestSdk android.net.cts.ConnectivityManagerTest#testGetRedactedNetworkCapabilitiesForPackage" />
<option name="compatibility:include-filter"
value="GtsGmscoreHostTestCases com.google.android.gts.wifi.WifiHostTest" />
<option name="compatibility:include-filter"
