Forgot to commit these...

Change-Id: I33278e41728c220492681f3eed9c0811182b5579

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