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: Ic3e4479c14139b1a374169c22dd7b022a973b4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>