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

Change-Id: I7835d8d3213f031b115e838d1e0f819069251ca2