[automerger skipped] Merge "Merge changes (ag/23575528) in ag/udc-dev branch to aosp/main branch." into main am: da13b74b17 -s ours am: b714c8c689 -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: I19d8847ef53d02262c8ddf878cfd7a8f64903a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>