Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test"