Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850

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

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