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

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