Merge changes from topic "weaver-vts-fix" into main am: 2a5366d8 am: d9769b4a am: 84c5619f

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



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