Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac08

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

Change-Id: I39123a9f916ac3cb82888405f5f8a49ebc8f93b7