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

Change-Id: Ic46b40b4e9cb053ea9bb8af7a0bbdfe79fdb1a17