Merge "Stop the actual job in question." into tm-dev am: 368b3a7c am: 36ca3bdd am: c53632b8 am: 5f1504a3

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



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