Merge "Add Test cases to Nfc VTS" am: eed21780a1
am: 8c3a44084c

Change-Id: I6a7eae8ecdcc9e67f563b2674c39124f423af4ca