Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into qt-dev am: fc480f5904
am: 86ccc5e1d6

Change-Id: I6ae2e2863a726138d4b210bf70b3552de9637edc