Clean up notification settings am: 6a603e7f4b am: 09d9da5624

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

Change-Id: I494570bde4b2121828c52f9224f5f2ed382e476f