Merge "Revert "Wipe the LockscreenCredential in DPMS#resetPasswordInternal"" into main am: 7a27431f65 am: fbfce4e308

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3068720

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