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

Change-Id: Ia689cadc4104acb4340d37ccefadea6753ff2a3b