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

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



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