Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev