[automerger skipped] Merge "update_verifier: Verify blocks" into tm-qpr-dev am: 9fd1bd240e -s ours am: 872885b5b1 -s ours

am skip reason: Merged-In I18946fb730376f19cce0738bd6765d5f5d0248b6 with SHA-1 dc1f6dadef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20913763

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