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

Change-Id: Ic605a314ffb8305611ee09399f8e76c3ccea942b