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