am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev

* commit '6d5089b29e83ccde82a6b078eb730d9d5c27f1e6':
  TIF: use 'TV app' instead of 'Live Channels'