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

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

Change-Id: I0c2b4819da6a7a60692bac3279809791c31c2ae6