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

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



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