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: d3516aa5 am: 859df29c

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



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