Active display: unregister proximity if pocket mode not used or active display disabled
[log]
special thanks to Der-Schubi for helping to fix this

Change-Id: I7c634e1ee48e82024faad53bb1bae8fe19da439d

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