Merge "Add a notification that tells users their NFC is blocked" am: 4adff5bfa2

Change-Id: I53bf8639d15943f36a77a29a7d31db02266f3291