[automerger skipped] Merge "Prevent interleaved verification" into tm-qpr-dev...

[automerger skipped] Merge "Prevent interleaved verification" into tm-qpr-dev am: e16da5a4 am: eb577a7e -s ours

am skip reason: Merged-In I7e8a2fa7333d05a226268b325338e3fac69ddae0 with SHA-1 da7d72d8 is already in history

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



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