Merge "Update NfcPermissionTest" am: 2b8ab50a14 am: 7a650e8c14

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

Change-Id: Id758b195c2c0196d176c8c31a7478b42e5c7830f