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

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

Change-Id: Ic577a48ace9c1cbdbdf4eca45cba8e1bb86a9773