Merge "Update the string of Settings preference for device lock" into udc-dev...

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

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



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