Pep Guardiola has signed a two-year contract extension that will keep him at Manchester City until 2025.