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

Change-Id: Ibf9ee2479402f9d2f76d3cdd936ab52df39b3538