[automerger skipped] Allow LockscreenCredential to represent any proposed...

[automerger skipped] Allow LockscreenCredential to represent any proposed credential am: 8c9ac5c0 am: bfea325f am: 38dbc5d5 am: 0b4f60c4 am: 76804029 -s ours

am skip reason: Merged-In I6b951759aa7fabacc46c20bbfd31d3a0dafa4c1c with SHA-1 8066a758 is already in history

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



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