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

Change-Id: I54af85474cbb99d19f3f6e345a62a31eb076e1cb