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

* commit '545d22e0f95cf131d728637e60f9382a029cd0ef':
  TIF: make TvProviderPerfTest stable.