Revert "cleanup"

This reverts commit df80d9c278c8d7c6381b40e96b9954d5968ac205.
Revert "HALO (1/2)"

This reverts commit 82781bc83743c9e920b1b2eb8ef363d0adc62b97.
Try number two

Change-Id: Ic47c74e4b8735b2461a1d54be3ba8cdd30c3d7d6

Conflicts:

	core/java/android/app/INotificationManager.aidl
	core/java/android/provider/Settings.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/pie/PieLayout.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/am/ActivityRecord.java
	services/java/com/android/server/am/ActivityStack.java