Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55
am: 40193db75a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654 Change-Id: I6f3736de63f9616f94c6b04fc965ad7906e3f090
This commit is contained in: