Merge "Fix 5797764: don't hold PowerManager lock when changing native brightness"