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

Change-Id: Id7665f3d4d8ead531c214a4ae5f542030e59729d