Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
am: f63cb49b15

Change-Id: If3d06de8fcc60080b51bb367ddc37b3d924af0b3