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

Change-Id: I6d42d2e5fc0691469f561b26444798d84e243042