Merge "Update NfcPermissionTest" am: 2b8ab50a14

Original change: https://android-review.googlesource.com/c/platform/cts/+/1676951

Change-Id: I67d66e3c3665d3fd19ccc05d960571fbd56c9967