Merge "Convert gatekeeper hal test to use VtsHalHidlTargetTestEnvBase"