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

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