Fix build from last merge. Add merging of LTE and network tiles

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
Fix build from last merge. Add merging of LTE and network tiles

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
Merge branch '444' of https://github.com/snacksAOSP/frameworks_base into 444