AD: cleanup NotificationManagerService.java