Merge "Add NFC 1.1 VTS Test"
am: bf81fc584b

Change-Id: I3b4dadf0c5a361327c0bfc9100732122151362e4