Merge "Support NCI 2.0 for NFC VTS" am: 7b62681f43 am: 8f517e1e56 am: f8471253fa
am: e47d9bd3ca

Change-Id: Ic7b13647a73ce4269cf020059d651746c1155d6d