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

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