am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev

* commit '05c581ac4d6f44263891eae94a41a3841634d89c':
  DO NOT MERGE Hide more leanback stuff.