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

Change-Id: I07223fe924860dee0ce22d0946d569eeef6b9d7e

Conflicts:
	res/values-es/pa_strings.xml
	res/values/pa_strings.xml
Configurable volume panel style (2/2)

    - We can set:
    1 - Single
    2 - Expandable
    3 - Expanded
    4 - None

    Part of original commit: f2eb658058a8428a76387db5891af9b652a0166d
    Thanks to @DvTonder

Change-Id: I2d5fe7e2901524ded0a28821233b3b3f3c72c1a7

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	src/com/android/settings/SoundSettings.java
Merge branch 'master' of https://github.com/BlakKatRom/platform_packages_apps_Settings