Merge "Parameterize VtsEvsHalV1_1TargetTest am: 2056c2da3b am: f43c80dbb1" into rvc-d1-dev-plus-aosp am: 9abae88d4b am: 46159cd184

Change-Id: I4c7f364e9e45cb021049b77b340e9aacb2fbedda