Merge "Convert VtsHalOemLockV1_0TargetTest to be parameterized test"