HALO 2/2

Change-Id: Iaaa538e4d63feeb1da5ca7bc48fb2916e4bd591b

Conflicts:
	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
	services/java/com/android/server/am/ActivityStack.java
last halo derp
-left out these drawables

Change-Id: I3993ac9dec3ad2d47440c7757c59bf15e5e2064f
FB: Halo: Update halo commit
FB: Halo: fix incomplete cherry-pick
FB: Halo: Fix build error