Merge "Prevent interleaved verification" into tm-qpr-dev am: e16da5a4

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



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