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

Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56