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

Change-Id: Ib557ea7149026bad306a6acc4f744221f24b4ce1