Merge "Convert oemlock hal test to use VtsHalHidlTargetTestEnvBase" am: 7e5c008f60 am: 4ff1a7dba2
am: 0a136f76a3

Change-Id: I4102b3fb8318da45df94fbfc115e7471b25873fd