am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev

* commit '4c8ddbd9481c7d773634d20be46b0a03f2fcf630':
  TIF: Ensure the global search can query EPG data