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

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



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