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