Cleanup button wake settings (1/2)

Change-Id: I972251384eee15cf9e4915cd82d189ed7ef3050d

Conflicts:
	res/values/cm_strings.xml
	res/values/config.xml
	res/xml/button_settings.xml
	src/com/android/settings/ButtonSettings.java