tree 8b2b15cf628a0882e380a1710f9ed6a5744c3ffb
parent aadf463f5a7f73739fa6c7f5f47f4c0c1caac0a5
parent e8310817afcbdec92f687cc3dfd03563ae8dc4db
author Ady Abraham <adyabr@google.com> 1628182719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628182719 +0000

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: Ia14edfd16fb63d888978292343310af632bcfbff