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

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



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