Merge "Reduce flaky of AppNotificationPreferenceTest" into main