Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
am: 5201313232
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457 Change-Id: I7159fa5c5e80ddef9f00be87c0692a3a6b086a8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: