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

Conflicts:
	core/res/res/values/ose_symbols.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/ose_strings.xml
	packages/SystemUI/res/values/styles.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/pm/PackageManagerService.java