Merge "Fix EVS VTS test cases" into tm-dev am: 0e26e4a89d am: 70a8350fd7

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

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