Simplify Weaver VTS test am: 42d76ae5df am: cf54aa6cea am: 1832038ebb

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

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