Add active display timeout option 2/2

Signed-off-by: scott <scott@ubuntu.com>

Change-Id: If8537d94e5efdfd91083d9fbc1881620b5df5d3a

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/active_display_settings.xml