Trump will be president until at least January 2029.
2020 election will end up being completely thrown out therefore making trumps first election last 8 years.
The 22nd amendment only states 'two elections' and says nothing about the length of each term.