Merge "Convert VtsHalKeymasterV*_0TargetTest to be parameterized test" am: aae9ff2315 am: 5960d7b49e am: 78648b8a28

Change-Id: I6d7383a4649ac9c1f2144c7ec05580e3c79486ca