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

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



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