Merge changes from topic "weaver-vts-fix" into stage-aosp-udc-ts-dev am: ea6fdd26

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



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