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