Merge "Parameterize VtsEvsHalV1_1TargetTest am: 2056c2da3b am: 367ec0b90e am: 00013579d8" into rvc-qpr-dev-plus-aosp