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 am: f9726a74 am: 2c33ef8c am: db0e8170

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



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