Active display: Option to change display timeout…
…[1/2] [log]

Change-Id: I3e0d9d05ddf3892b0223c012b5420bbcf4e3b6e1

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java