Merge remote-tracking branch 'PA/kitkat' into remix-staging

Conflicts:
	core/java/android/provider/Settings.java
	core/java/android/view/VolumePanel.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	services/java/com/android/server/InputMethodManagerService.java