Merge "sf: Allow SystemServer to set the display brightness"