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

Conflicts:
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java
Revert "PIE: Improve assistant handling"

This reverts commit 32f18553a81cc7f7fd0731d13a7f26fea6e38f51.

Conflicts:
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java