Merge "Move brightness handling to a background thread" into nyc-mr1-dev am: f1a6f1e032
am: 166d51eb1f

Change-Id: Iec280d6ee16c9c997b30b979310bd6c9e31cfd26