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

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