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

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



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