Revert "Put all notification services in one place"

This reverts commit c454951779f53c7851898dd099eeba300f69a438.
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_packages_apps_Settings-1 into cm-11.0
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_packages_apps_Settings-1 into cm-11.0
Revert "Update cr_strings.xml"

This reverts commit 237c272a451701de08ab7dd34993a486c4cc4647.