[automerger skipped] Simplify Weaver VTS test am: 42d76ae5df am: cf54aa6cea am: 1832038ebb -s ours am: 4249bc9bd3 -s ours

am skip reason: Merged-In Ia6dca996103057bfdc9002bc9ab2c039e2333ed9 with SHA-1 42d76ae5df is already in history

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

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