Merge "Support alternate button" into main am: 88bbe8fe1d am: 6eccd73996

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020

Change-Id: Ia2853f58135f975bf0f6dd687efee52e622eac8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -293,6 +293,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
                     new ChooseLockSettingsHelper.Builder(this);
             launchedCDC = builder.setHeader(mTitle)
                     .setDescription(mDetails)
+                    .setAlternateButton(alternateButton)
                     .setExternal(true)
                     .setUserId(LockPatternUtils.USER_REPAIR_MODE)
                     .show();