am 9d3dd237: am b186f7fb: am 280b547a: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev automerge: 4c8ddbd

* commit '9d3dd237e3c141230e11fd79603adf7b1deb10ed':
  TIF: Ensure the global search can query EPG data