am 61fba23a: am 3b7983ed: am 35045c8c: Merge "TIF: Add missing tests for android.media.tv.TvInputInfo" into lollipop-cts-dev automerge: d8f754a

* commit '61fba23aeda5085798124906ed52d8bc22300ccb':
  TIF: Add missing tests for android.media.tv.TvInputInfo