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

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



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