Merge "TIF: Use Channels.CONTENT_URI for launching the TV app" into lollipop-cts-dev
automerge: a337d05

* commit 'a337d05392ff8143370c4c4a952bda893df64e26':
  TIF: Use Channels.CONTENT_URI for launching the TV app