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

* commit '35045c8ca2b63eb76a76ea5c632b79e97a1146c3':
  TIF: Add missing tests for android.media.tv.TvInputInfo