Merge "Add NFC 1.1 VTS Test" am: bf81fc584b
am: 8e0c79dffd

Change-Id: Idbfe22efcf94517248df78fd6b902a1c1767e9be