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

Conflicts:
	packages/SystemUI/res/values/ose_strings.xml
	packages/SystemUI/src/com/android/systemui/shortcuts/Immersive.java
	packages/SystemUI/src/com/android/systemui/shortcuts/Reboot.java
	packages/SystemUI/src/com/android/systemui/shortcuts/Screenshot.java