am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev

* commit '6fd394ae799cc81e3b571773819ee99374a25158':
  Improve auto-brightness hysteresis.