[1/2] Permit home button wake to be configurable

To activate, enable bool config_show_homeWake in
device overlay/packages/apps/Settings/res/values

Change-Id: I00afe89ba5bf36d74b93a40b9d15eef2e805611f
Fix up remove Wakeup preferences

Follow the bug fix addressed in http://review.cyanogenmod.org/#/c/43544/

This fix the issue both Home key wake and Volume rocker wake preferences will be displayed
if either of them activated in device config.

If both of them are not activated it looks fine because eventually Wakeup category
itself removed,though.

Change-Id: I28b7b45d209c3beb9559ed9e7b89612bf8df8bab
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1-n7

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java