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

Change-Id: I7ef07b3aa3a59f510a7a5e897d134707c04f675b