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

Change-Id: I62f3775591e65004be4db03cffde2c7c73d22869