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