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

Merge "Calculate correct checksum." into tm-dev am: 83962ee9 am: 3f1492e7 am: 30475c0d am: c8ac500e

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



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