Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" am: 6a0450a166
am: 80b6b3c20c

Change-Id: I1465457a3dcb750dc8e857acc38618019d1b6005