Merge "Revert "Fix SafetyCenterNotificationTest flakes"" into tm-mainline-prod