Revert "[2/2] Settings: Add an option to reset custom user preferences"

This reverts commit aaca1dea0bcc8149c8810461ebb0d84f207c91cd.

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/PrivacySettings.java