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:
	services/java/com/android/server/am/ActivityStack.java