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 am: a4fb2d0b

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



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