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

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

Change-Id: I9b911cd1d0db77c6d2b9b67a1891dab7f9365214