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

This reverts commit d61de6e1d5a12ac7507bcd38c780e39d51b3f4e9.

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

Change-Id: Id9e8b3916d968036f595928ac0e82c6830bf9bc0
Revert "Active display: Fix "turn off proximity sensor if not needed""

This reverts commit 1745fcaeaa1832524425ae073eb3c37a637e8bdf.