Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"

This reverts commit 0725bea86e.

Reason for revert: Settings crash
Bug: 120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee

Android.mk

@@ -30,8 +30,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.preference_preference \
     androidx.recyclerview_recyclerview \
     com.google.android.material_material \
-    setupcompat \
-    setupdesign
 
 LOCAL_JAVA_LIBRARIES := \
     telephony-common \

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

@@ -38,7 +38,7 @@ import com.android.settings.SetupEncryptionInterstitial;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.utils.SettingsDividerItemDecoration;
-import com.google.android.setupdesign.GlifPreferenceLayout;
+import com.android.setupwizardlib.GlifPreferenceLayout;
 
 /**
  * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure

src/com/android/settings/utils/SettingsDividerItemDecoration.java

@@ -21,7 +21,7 @@ import android.content.Context;
 import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.setupdesign.DividerItemDecoration;
+import com.android.setupwizardlib.DividerItemDecoration;
 
 public class SettingsDividerItemDecoration extends DividerItemDecoration {