Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada
am: 8b35111d3e

Change-Id: Icedc6764b7b3fdf9b5706bedc3e4fe0dc0d39c58