[automerger skipped] Merge changes from topic "weaver-vts-fix" into...

[automerger skipped] Merge changes from topic "weaver-vts-fix" into stage-aosp-udc-ts-dev am: ea6fdd26 am: df736dd1 am: 5765cfa1 am: fa13fcb7 -s ours am: 4f20d0e7 -s ours

am skip reason: Merged-In Iac1b4476620e51c645e3ad57444ee386cb879029 with SHA-1 3d1e0b75 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24180062



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