am 8c34f39c: am 75a568d1: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev automerge: 7f2984f

* commit '8c34f39c8346517d93814eed528d88058f19debe':
  TIF: use 'TV app' instead of 'Live Channels'