Merge "Fix NPE in NotificationManagerService bugreport dump" into main