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

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

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