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

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



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