HALO (1/2)

Change-Id: I3b3c1759d25fdd35c4d67d6563eeb448ea48e09b

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	core/java/android/app/INotificationManager.aidl
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/NotificationManagerService.java