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

Change-Id: Ib62faa847c91b8629ee9c67fa7efb020b56dae2d