Frameworks: Ability to Enable/Disable Smart Wake covers

Change-Id: Idf298618b49895898222deb94d8097b20cc05516

Conflicts:

	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
fb: change default value of lid controll to enabled

Change-Id: If8a91d3553344dc6efefe236323aad9b43e7dd50

Conflicts:

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