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

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

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