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

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



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