Merge "libsnapshot: update offset functions" into main am: b119efef am: 4c7d0315 am: c140ddb7

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



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