Clean up notification settings am: 6a603e7f4b am: 7c5f01e560

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: Ic943d1f7942fac9972378baeeb8908f6aa60ce9e