[automerger skipped] Merge "Parameterize VtsHalEvsV1_0TargetTest" am: 6905b343 am: b61c44ed -s ours
am skip reason: Change-Id Ica8f5e6228d7d4b1426d8cc9cd2c570d6b584897 with SHA-1 e472971e is in history
Change-Id: Ib1ccf1ef8e66047e7615eca278b6071115922143