Didn't Apple move to a 3 year S cycle?

Like iPhone 6, then iPhone 6s, then iPhone 7 all being the same phone and then introducing a new design with the X.

So with this past year being the XS, this year will be the whatever XS 2 is, but with the same design, then we can expect a new design next year.

Meaning that their China not upgrading problem, as per the article, will continue for at least another year.