Active display: Option to change display timeout…

…[1/2] [log]

Change-Id: I3e0d9d05ddf3892b0223c012b5420bbcf4e3b6e1

Conflicts:
	core/java/android/provider/Settings.java
Active display: allow hiding low priority notifications. [1/2]

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

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

Conflicts:
	core/java/android/provider/Settings.java