Merge "Skip invalidating caches in NotificationManagerServiceTest" into main