Merge "Update VtsHalEvsV1_*TargetTest am: 7bc98ce6ed" into android12-tests-dev