Fixes (Not Final)
[1/2] CPUFreq Tile

Conflicts:
	core/java/com/android/internal/util/cm/QSConstants.java
	packages/SystemUI/res/values/rr_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

Conflicts:
	core/java/com/android/internal/util/cm/QSConstants.java
	core/java/com/android/internal/util/cm/QSUtils.java
	packages/SystemUI/res/values/axxion_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Revert "Remove lockscreen slide delay option (2/2)"

This reverts commit fcd7b7d9d0683c225ffafbcb454e6b60716dc960.

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