Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev