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

Conflicts:
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/WindowManagerPolicy.java
	packages/SystemUI/src/com/android/systemui/quicksettings/CustomTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java