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