[automerger skipped] Merge "ChooseLockPassword: convert to use...

[automerger skipped] Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7 am: 335752ed am: be262063 am: a6448e93 am: faaee7a8 -s ours

am skip reason: Merged-In I5f1822a34688473cb103eb64dca56e4c19d4dd08 with SHA-1 b5470943 is already in history

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



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