Revert "Settings: On-the-spot preference clear option"

This reverts commit 760632aa705d6da220ff32418ed39d6ba9c34d68.

Patchset 2: Fixed little merge derp

Conflicts:

	res/values/strings.xml
Change-Id: I08ccfedf2206fe34948fce224026aed6ecabd7e1
Signed-off-by: arham jamal <arhamjamal@gmail.com>
Conflicts:
	src/com/android/settings/slim/service/NotificationService.java