Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
am: f120e3d563
am: d3516aa5d0
am: 859df29cf0
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>
This commit is contained in: