Merge remote-tracking branch 'slim/kk4.4-caf' into ose

Conflicts:
	core/java/com/android/internal/util/ose/QSConstants.java
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/SystemUI/res/values/slim_strings.xml
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java