Merge "Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65 am: 8142017f62"