Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main am: 41e9d7d3a2 am: 4ebe585454

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337165

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