Merge "Support NCI 2.0 for NFC VTS" into oc-dev am: 5ed63181a9
am: ccccc15034

Change-Id: I1d3968fd5178b90e05a7ace963d27105d01c16d6