Merge "Mitigate LSKF leaks through the LockscreenCredential in KeyguardManager" into main am: 6cd5d509e8 am: eb8583b394

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

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