Merge "Stop the actual job in question." into tm-dev am: 368b3a7c

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



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