Merge "Update NfcPermissionTest"