am 8ac0ab1b: Merge "TIF: make TvProviderPerfTest stable." into lollipop-mr1-cts-dev

* commit '8ac0ab1b2d161acacf1e8cc5268d6c94fe4817af':
  TIF: make TvProviderPerfTest stable.