Merge "Revert "Wipe the LockscreenCredential in DPMS#resetPasswordInternal"" into main