active display: unregister proximity if pocket mode not used or active display disabled

Change-Id: I7c634e1ee48e82024faad53bb1bae8fe19da439d
Revert "active display: unregister proximity if pocket mode not used or active display disabled"

This reverts commit 3fb1338ff203808a19c9976bf94c914f43299904.