Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac08 am: 1eb9b6cd21 am: 597e503df6

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

Change-Id: I9049852b633518f12062abf064ae34b8e2720a16