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

* commit 'caf3c12ca1ee420acdbb0181ffe5a0497ce84af3':
  API review: android.media.tv