Merge "New Pipeline: begrudgingly tolerate a few reentrant runs" into...

Merge "New Pipeline: begrudgingly tolerate a few reentrant runs" into tm-qpr-dev am: 5bb3f6f7 am: e45a78d7

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



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