Revert "[2/2] Settings: Doze (ambient display) timeout"

This reverts commit f35f983bd6265e75b20fec0d24e139e0f4bb3115.

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