Merge "snapuserd: I/O request on overlapping blocks during snapshot-merge." into main am: 743c4cdb1c am: 0d38654b34 am: 614a4d4268 am: d399f0820a am: bfe8f13f17

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

Change-Id: Ib239f28b88bf8494cd9c5a947f3c6541192e6d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>