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

Change-Id: I18af9b57cc44d6e90cd11a046e4e0993aa04ed53