Merge cherrypicks of ['googleplex-android-review.googlesource.com/24119046'] into udc-release.

Change-Id: Iba3a6402de58f297140aa23c5ba05095317dbebd

tools/vts-core-tradefed/res/config/vts-exclude.xml

diff --git a/tools/vts-core-tradefed/res/config/vts-exclude.xml b/tools/vts-core-tradefed/res/config/vts-exclude.xml
index b70b1c6..e64fbd0 100644
--- a/tools/vts-core-tradefed/res/config/vts-exclude.xml
+++ b/tools/vts-core-tradefed/res/config/vts-exclude.xml
@@ -35,9 +35,9 @@
     <option name="compatibility:exclude-filter" value="VtsHalConfirmationUIV1_0TargetTest *ConfirmationUIHidlTest.MalformedUTF8Test3/*"/>
 
     <!-- b/281630896: Disable tests for UDC as not enough soak time to test the proposed fix in ag/23905225. -->
-    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest UwbAidl.ChipClose"/>
-    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest UwbAidl.ChipCoreInit"/>
-    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest UwbAidl.ChipOpen"/>
-    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest UwbAidl.ChipSessionInit"/>
-    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest UwbAidl.ChipGetSupportedAndroidUciVersion"/>
+    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest *UwbAidl.ChipClose/*"/>
+    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest *UwbAidl.ChipCoreInit/*"/>
+    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest *UwbAidl.ChipOpen/*"/>
+    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest *UwbAidl.ChipSessionInit/*"/>
+    <option name="compatibility:exclude-filter" value="VtsHalUwbTargetTest *UwbAidl.ChipGetSupportedAndroidUciVersion/*"/>
 </configuration>