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

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



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