Merge "[automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab786012 -s...

Merge "[automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab786012 -s ours am: ddb56ed7 -s ours am: d69178ad -s ours am: 4e717156 -s ours am: cfdde09b -s ours am: fddc9bbe -s ours am: d76cee8d -s ours am: d2b3057d -s ours" into udc-qpr-dev-plus-aosp