am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit 'c2b8df82d701eb3508da06f75b2201c3f9796373':
  FEATURE_LEANBACK implies that the device is a tv.