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

Change-Id: I759e07640c74137d5480af73a9b41c974101ab22