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

Change-Id: I07223fe924860dee0ce22d0946d569eeef6b9d7e

Conflicts:
	src/com/android/settings/PrivacySettings.java