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

Change-Id: Ia7ac4815e12116330932fe7d5bd8dfb4d92a9d08