Merge "NotificationManagerService: minor cleanup"