Revert "[1/2] Frameworks: Combine LTE & 2G/3G Tiles"

This reverts commit 82e5943272158690a4355ec2f982c9aa5196af33.
Revert "[WIP] Quicksettings 3.0"

This reverts commit 50679fae1ee419549230e08d73387ecadfbf4f4d.
[1/2] Frameworks: Combine LTE & 2G/3G Tiles

This combines both network tiles into one tile.
2G -> 3G -> 2G3G -> LTE

Linked commit: packages/services/Telephony

Change-Id: Ia0d8edaec0e920b9ba174ec6ce49c5e7b832a5ab

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