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

Change-Id: I65cd9c3d9818871130eea5351f02d655bac44988