Fix build from last merge. Add merging of LTE and network tiles
A couple of improvements to edit mode

* Fadeout selected dragging item to 5% opacity
* Disable hovering on touch

Change-Id: Ie2be81f83e72c83071577a2e56b90160dc701370

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
Fix: Network tiles for CDMA devices

PS 1: initial fix
PS 2: remove 3G Only for CDMA
PS 3: rebase for QS 3.0 changes

Change-Id: I2e526c8d94cc561c48c2a9198311e03b4f18328d
Fix issue while scrolling on edit mode

Thanks to @rob43 on XDA-developers for this fix

Change-Id: I0e5cd1c2472415dcb8f003b5dc88a7e4d7b55bbf
Change class

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I6124d0e987e7417e56d277422be708c59900f636