Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into android10-tests-dev am: 13c9e764eb am: 57dbe788ed

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1183196

Change-Id: I48a65d83f127987a05fb855c2e84589717999d5b