Merge "Update VtsHalEvsV1_*TargetTest" am: 1f6ecfbab0 am: 109cfa5121

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

Change-Id: I67ef5ae70d2f71147940c8d3e09c3176bc6e69f6