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

Change-Id: I09aed468b4b46bc7289c0f2d32fefbef53b39a1e