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

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