Yes, it does look like the end of extended service is 2020/2025 (see link above) -- which used to mean you would get security updates through that time. They have not given up on the strangeness of supported machine lifetime though, it has moved to a footnote. I take this to mean that at some point prior to end of support, your device may no longer be able to get security updates if it somehow becomes obsolete. By packaging security and other updates together the fine distinction presently between end of support and end of extended support is blurred. And how will MS tie your machine to the OEM Manufacturer's support period?
** Updates are cumulative, with each update built upon all of the updates that preceded it. A device needs to install the latest update to remain supported. Updates may include new features, fixes (security and/or non-security), or a combination of both. Not all features in an update will work on all devices. A device may not be able to receive updates if the device hardware is incompatible, lacking current drivers, or otherwise outside of the Original Equipment Manufacturer’s (“OEM”) support period.