am 4a22cb2b: am f550dd4d: am caf3c12c: Merge "API review: android.media.tv" into lmp-dev

* commit '4a22cb2b2b0c48f57777e48dfc2462fb6ce2f72a':
  API review: android.media.tv