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

Change-Id: I7e7655a92709099fd21a19ef6ce441fa54ec1cb1