[automerger skipped] Simplify Weaver VTS test am: 42d76ae5 am: cf54aa6c -s...

[automerger skipped] Simplify Weaver VTS test am: 42d76ae5 am: cf54aa6c -s ours am: 51604c6e -s ours

am skip reason: Merged-In Ia6dca996103057bfdc9002bc9ab2c039e2333ed9 with SHA-1 961a138e is already in history

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



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