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: Id73e3e7efc55106977d574111d90a3b8c66afa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>