Activedisplay: fix SystemUI force close.

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