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