am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev

* commit 'f52749d3905352384c3027c5b9b0946ec3e5f490':
  TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest