Merge "Show work lock confirmation in a task overlay" into udc-dev am: 7d91a4916d am: c16ec1ac55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21851695 Change-Id: I739dbe99483ee2326db319a8477e66cce2819012 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: