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

* commit '7f2984fcd44ee08b10a27353c137ef019e3bc0e5':
  TIF: use 'TV app' instead of 'Live Channels'