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

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

Change-Id: I86852d25a8fb258ba8ffbbe594f2ce04780e40cb