am 08bb61a5: am 0b08abe1: Merge change I9521cf8b into eclair

Merge commit '08bb61a5290e37103ef74a8b08ac8adab8aba9f7' into eclair-mr2-plus-aosp

* commit '08bb61a5290e37103ef74a8b08ac8adab8aba9f7':
  Register for light sensor events if non-hardware based auto-brightnees is enabled