Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: d07a484c46 am: ae5c01e692
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751 Change-Id: I81c7315c5f5d39836afa855d6872f2e88034f901
This commit is contained in: