Active display: Don't register proximity if pocket mode not used
[log]

Change-Id: I6f27bd86e2dbe2bc14b88acb94668a593590853a

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Merge branch 'cm-10.2' of github.com:temasek/android_frameworks_base into cm-10.2