Merge "Fix auto-brightness when display on and policy doze" into main