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