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