am 706ee75e: 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 '706ee75eafbaecfbeb6ad34edfa66397f6602f84':
  TIF: Use Channels.CONTENT_URI for launching the TV app