Fix remaining framworks & systemui HALO derps

Change-Id: I880dfce30bcaf0e59e24ba315897e699adabf2f8

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/am/ActivityRecord.java
	services/java/com/android/server/am/ActivityStack.java

Signed-off-by: Pipeliner <pipeliner@pipeliner.(none)>
Merge branch 'jb4.3-test' into halo