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

Change-Id: Id891b08cdcfa88abef501487f8d5a2c9252b7e4a