Merge "snapuserd: Fix merging of overlapping copy blocks" am: 0efd6c2a4c

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

Change-Id: I63bcfb9878600baa696a03dfe0475d13334be9a7