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

Change-Id: Ia2df4d97c645e961c5615b6c60aa943a2c9bfaee