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

Change-Id: Ic561855e43b55b2f93ffd650bfb218096bd742d3