Merge "Convert VtsHalKeymasterV*_0TargetTest to be parameterized test"