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

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

Change-Id: I285fe94b060dd20e64e368e5d4dca0aa00bdc35d