Merge "Convert VtsHalNfcV1_*TargetTest to be parameterized test" am: a04877f2b3 am: 2ab91aa232
am: 4d3bdfd7d9

Change-Id: I4dbb20d0f8bb48fcd458105a4c9fb46eac9a27fe