[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml
[2/2] settings: volume tweaks

Setting to disable volume adjust sounds (VOLUME_ADJUST_SOUNDS_ENABLED)
This is so annoying :)

Enhanced dialog to add checkbox for unlinking ringer and
notification volume (VOLUME_LINK_NOTIFICATION)

EDIT:
No idea why google changed the order
Media is now above ringer but in volume panel
its different. So which one to change? :)

Conflicts:
	res/layout/preference_dialog_ringervolume.xml
	res/values/custom_strings.xml
	src/com/android/settings/RingerVolumePreference.java

Change-Id: Ia30bbb1c2f44d0c21cd08748bd552685810f960f

Conflicts:
	res/values/custom_strings.xml