Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d76 am: 0378dfff

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

Change-Id: Ieb4335ffb95f59aab3ade0eea6860448e2e23382