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

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SystemUI/src/com/android/systemui/BatteryCircleMeterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java