Merge "Stop tracking ghost jobs." into tm-dev am: 323def83 am: f2e0249a

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



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