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

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

Change-Id: I160361dc965c96588099ba69271e2a173d105ca3