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: 4764e9a4

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



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