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