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

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

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



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