Merge "Convert nfc hal test to use VtsHalHidlTargetTestEnvBase"