Merge "Calculate correct checksum." into tm-dev am: 83962ee9 am: e2e8dfeb

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



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