Active display: prevent force close
[log]

Change-Id: I0f96a964fbc55419f86a3707d9d6929f872e5bd8

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Active display: unregister proximity if pocket mode not used or active display disabled
[log]

Change-Id: I7c634e1ee48e82024faad53bb1bae8fe19da439d

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