Merge "libsnapshot: update resume offset calculation" into main am: bc518418...

Merge "libsnapshot: update resume offset calculation" into main am: bc518418 am: c29ecff8 am: 1f4e568b

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



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