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

* commit '26c7d92885639d7d51819141223edc535cdc9e08':
  TIF: Ensure the global search can query EPG data