Merge "Convert VtsHalOemLockV1_0TargetTest to be parameterized test" am: 423c61de7a am: fe0ce11562

Change-Id: I48e06c45e4c5f9490ff3e7585026c2106f7a3fa4