Merge "Use pending transition when task-org is unregistered" into udc-dev am:...

Merge "Use pending transition when task-org is unregistered" into udc-dev am: e5e601c6 am: 41bcfb31

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



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