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

[automerger skipped] Simplify Weaver VTS test am: 42d76ae5 am: cf54aa6c am: 1832038e am: 8b95ae99 -s ours

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

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



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