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