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

Change-Id: I562b46b71416406e2640fc84f7b6a064327a7ca8