Merge "Don't start work challenge unless auto-cancel." into udc-dev am:...

Merge "Don't start work challenge unless auto-cancel." into udc-dev am: 83b3e82a am: fb09c3c0 am: 873d6f4a

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



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