Cleanup button wake settings (2/2)

Change-Id: Ie37136cbd57c4c334321abbfa4543727e940bc43

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java