Merge "Move to DisplayManager brightness APIs"