Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0
am: c2a0a1c3ae
am: 338a62023a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398 Change-Id: Ifcfa3eb45e76acc7573f331911f9e8e028e91182
This commit is contained in: