Merge "snapuserd: I/O request on overlapping blocks during snapshot-merge."...

Merge "snapuserd: I/O request on overlapping blocks during snapshot-merge." into main am: 743c4cdb am: 0d38654b

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



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