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