Derp

(cherry picked from commit 6a02e0491857043b7887d9d0fd2090675b6ebf19)

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