Merge "Remove cancelled job from evaluation list." into tm-dev am: ff2c2c8a am: c86f2bff

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



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