Merge "Convert keymaster hal test to use VtsHalHidlTargetTestEnvBase" am: eeeaaf5589
am: 6e4263fa6b

Change-Id: Ic774c8e74511a02fe0e10975665a06fbf4365fba