[automerger skipped] Merge "Avoid loading duplicate jobs." into...

[automerger skipped] Merge "Avoid loading duplicate jobs." into udc-dev-plus-aosp am: a8c8940e am: 49954020 -s ours

am skip reason: Merged-In I3179261309031801f0506cf905206376e59af1fe with SHA-1 b74d32fa is already in history

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



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