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

Change-Id: Ifddce2d38d1a50eb7b70e675bbba4b75d489c1ef