Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"