Settings: allow home button to wake device [2/2]

Change-Id: I5c887422636f8bc51cb324339b3cdcac7af54400

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