am c1eb54fb: am 545d22e0: am cb18306a: am 28863e29: am 8ac0ab1b: Merge "TIF: make TvProviderPerfTest stable." into lollipop-mr1-cts-dev

* commit 'c1eb54fb9c57a23a8b652cb7d12a09640d537b86':
  TIF: make TvProviderPerfTest stable.