am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev

* commit '9873e099c32513cdb28c3ffb8c2306ad87f0b052':
  Add leanback device features.