Revert "Fix up remove Wakeup preferences"

This reverts commit 2c54e018b6d609563b174f78e9c7295f1869b70d.

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: Ie9ac24f41673c17456281f8e02b062ead725a498
Revert "[1/2] Permit home button wake to be configurable"

This reverts commit 7dae958adefd8f4a7594a74f8e05f1e3449e6cc6.

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I665feca39ddc9624fcd1cf6fc1240075caef07a5

Conflicts:
	src/com/android/settings/DisplaySettings.java