fixup! fix(material-experimental/mdc-typography): update incorrect levels

Author: mmalerba

src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss

@@ -20,12 +20,6 @@
       // Note that we include this private mixin, because the public one adds
       // a bunch of styles that we aren't using for the autocomplete panel.
       @include mdc-list-base_($mat-typography-styles-query);
-
-      // MDC uses the `subtitle1` level for list items, but the spec shows `body1` as the correct
-      // level.
-      .mat-mdc-option {
-        @include mdc-typography(body1, $query: $mat-typography-styles-query);
-      }
     }
   }
 }

src/material-experimental/mdc-core/option/_option-theme.scss

@@ -43,6 +43,14 @@
 
 @mixin mat-mdc-option-typography($config-or-theme) {
   $config: mat-get-typography-config($config-or-theme);
+
+  @include mat-using-mdc-typography($config) {
+    // MDC uses the `subtitle1` level for list items, but the spec shows `body1` as the correct
+    // level. Class is repeated for increased specificity.
+    .mat-mdc-option {
+      @include mdc-typography(body1, $query: $mat-typography-styles-query);
+    }
+  }
 }
 
 @mixin mat-mdc-option-density($config-or-theme) {

src/material-experimental/mdc-select/_select-theme.scss

@@ -89,12 +89,10 @@
       // Note that we include this private mixin, because the public one adds
       // a bunch of styles that we aren't using for the select panel.
       @include mdc-list-base_($mat-typography-styles-query);
+    }
 
-      // MDC uses the `subtitle1` level for list items, but the spec shows `body1` as the correct
-      // level.
-      .mat-mdc-option {
-        @include mdc-typography(body1, $query: $mat-typography-styles-query);
-      }
+    .mat-mdc-select-value {
+      @include mdc-typography(body1, $query: $mat-typography-styles-query);
     }
   }
 }