Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639
am: 0378dfff5a
am: 88b1052394
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650 Change-Id: I9b02755395575cca8b383ee55d245dbb373fe641
This commit is contained in: