Merge "Show confirm credential activity on parent when unpausing work." into...

Merge "Show confirm credential activity on parent when unpausing work." into udc-dev am: 383be3ac am: 550c0f16

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



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