Merge "Support NCI 2.0 for NFC VTS"