Merge "Update TV to show custom actions." into oc-dev am: 1a01d1298f
am: f7bb25e8ae

Change-Id: I858e5e115888a5c2ce39954ba50a3f7eef2f6014