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

Change-Id: I8963a8f0e1d08324e73ef10b73daa38366a1837a