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

Change-Id: I6592686f765e3474d1c02bf9b3bc243ab152b641