Merge "DisplayModeDirector: proximity should not vote on doze" into sc-dev am: e8310817af am: e42c6ed8d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15378209

Change-Id: I34868db7b91356b1472fa4bcf341bb6fe691d67f