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