Merge "Remove running jobs from pending list." into tm-dev am: 444880f0 am:...

Merge "Remove running jobs from pending list." into tm-dev am: 444880f0 am: e9069b19 am: 6900de4c

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



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