Merge "Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c4 am: 626f665a am: 8142017f"