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: 0ca7d94e

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



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