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

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



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