Merge "Merge "DisplayModeDirector: proximity should not vote on doze" into sc-dev am: e8310817af am: 3f8c8a8387" into sc-v2-dev-plus-aosp am: fb711e0f92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15378209 Change-Id: I513838286fd7fd4bc059d9e9ba4b0db0bee7a299
This commit is contained in: