am 4e3cdf85: Merge change 23619 into eclair

Merge commit '4e3cdf854441b84c15fd9f127127b6d116834c51' into eclair-plus-aosp

* commit '4e3cdf854441b84c15fd9f127127b6d116834c51':
  Add automatic lighting control framework