Might as well use TuneIn's subtext data as line2

Change-Id: I32d9fcacf6de91008628ff7ac8b726068b01a9b3
Merge branch 'public/7.7' into public/7.8