Merge "sdm: Defer brightness on deferred Doze"