Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev
am: f3a5f66139

Change-Id: Ifa88fe71ed6d1b75be62b579908f412019ed68f2