fixup! refactor(material/progress-spinner): change mat-progress-spinner to use MDC's token API

Author: wagnermaciel

src/material/progress-spinner/progress-spinner.scss

@@ -11,11 +11,11 @@
   // Add the MDC progress spinner static styles.
   @include mdc-circular-progress.static-styles();
 
-  // Add the official slots for the MDC circular progress.
-  @include mdc-circular-progress-theme.theme-styles($mdc-circular-progress-token-slots);
-
-  // Add default values for tokens that aren't outputted by the theming API.
   .mat-mdc-progress-spinner {
+    // Add the official slots for the MDC circular progress.
+    @include mdc-circular-progress-theme.theme-styles($mdc-circular-progress-token-slots);
+
+    // Add default values for tokens that aren't outputted by the theming API.
     @include mdc-circular-progress-theme.theme(m2-mdc-circular-progress.get-unthemable-tokens());
   }
 }

src/material/progress-spinner/progress-spinner.ts

@@ -80,6 +80,8 @@ const BASE_STROKE_WIDTH = 10;
     'tabindex': '-1',
     '[class._mat-animation-noopable]': `_noopAnimations`,
     '[class.mdc-circular-progress--indeterminate]': 'mode === "indeterminate"',
+    '[style.width.px]': 'diameter',
+    '[style.height.px]': 'diameter',
     '[style.--mdc-circular-progress-size]': 'diameter + "px"',
     '[style.--mdc-circular-progress-active-indicator-width]': 'diameter + "px"',
     '[attr.aria-valuemin]': '0',