am 9b43f214: am f32f48bb: am 3e3e3af6: Merge "TIF: Use Channels.CONTENT_URI for launching the TV app" into lollipop-cts-dev automerge: a337d05

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