Merge "Convert oemlock hal test to use VtsHalHidlTargetTestEnvBase"