Merge "Try to avoid overlapping job execution." into tm-dev am: dfc0bae5 am:...

Merge "Try to avoid overlapping job execution." into tm-dev am: dfc0bae5 am: d2e57beb am: 2f587636 am: b8c5181c

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



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