am 0ff8f796: (-s ours) am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev

* commit '0ff8f796d968a45d26038e3a08ba9785f985a1ec':
  DO NOT MERGE Hide leanback packagemanager apis.