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

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



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