Pep Guardiola agrees two-year contract extension with Manchester City