Merge "Show work lock confirmation in a task overlay" into udc-dev am: d068214d am: 7857d4ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21853349



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