[automerger skipped] Merge "Merge changes (ag/23575528) in ag/udc-dev branch to aosp/main branch." into main am: da13b74b17 -s ours

am skip reason: Merged-In I0aac488437264a5fed545dcacd248e8a2f02e52b with SHA-1 7105ff05d8 is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2737493

Change-Id: Ife9f753614c49e800072f4da5df5d72ea229c26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>