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

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



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