Merge "Partially undo "Try to avoid overlapping job execution."" into tm-dev am: 55e09c9e

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



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