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

Change-Id: If3841cc2b162daac17eb3650919036e71d5eb1a1