Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode""