Merge "Convert nfc hal test to use VtsHalHidlTargetTestEnvBase" am: 3ddc39293b am: 3cc658c11e
am: ae709891ab

Change-Id: I251b1c44adefd8e8e5cb0b341abfff5ce20ca3db