Merge "SystemUI: Add NFC tile" am: 943a52862e
am: 8fbdf116d0

Change-Id: I114a75548444e409d1f72183589c886ca9fbccbd