Merge "Remove unused code in NotificationManagerService" into main