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

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



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