am 5085848d: am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"

Merge commit '5085848ddbadaafa088ed85753156adc2e54554d'

* commit '5085848ddbadaafa088ed85753156adc2e54554d':
  Make the LED colors when charging customizable by the vendor