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

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



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