Active display: Next try to fix "turn off display if device gets pocketed again"

Change-Id: Ice9354faf4a939f31a5bd590031ee001a62712fb

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