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

Merge "snapuserd: Fix merging of overlapping copy blocks" am: 0efd6c2a am: 64b0b1a5 am: 9cfe067b am: 4d20751c

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

Change-Id: I45d6013d011757d0e1a83f54dcb2d050c8836f05