Merge "Fix the calculation of package verification code which should not...

Merge "Fix the calculation of package verification code which should not include algorithm information." into main am: fb55377c

Original change: https://android-review.googlesource.com/c/platform/build/+/2688227



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