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

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

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



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