Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678

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

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