Fix NFC tile not showing on reboot

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java