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

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

Change-Id: I8b0dd0e92e4715a2452edce9698898ee27daf2f8