Active display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc

Conflicts:
	res/xml/active_display_settings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java