Merge "Mark @NonNull where possible in TvTrackInfo"