Revert all LockScreen Notification commits
Merge branch 'kitkat' of https://github.com/ThinkingBridge/platform_packages_apps_Settings into kitkat

Conflicts:
	res/values-ko/strings.xml