Merge "NfcTile: make sure NFC adapter is always available when needed"
am: 13ade8f910

Change-Id: I731c4d0f3460d1b2a24232a87afcd5c327ecb4b0