Merge "Convert keymaster hal test to use VtsHalHidlTargetTestEnvBase"