Merge "Gray out admin-disabled screenlock option properly" into main

src/com/android/settings/password/SetupChooseLockGeneric.java

@@ -243,6 +243,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
         @Override
         protected void onCreate(Bundle savedState) {
             setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
             ThemeHelper.trySetDynamicColor(this);
             super.onCreate(savedState);
         }