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 am: 614a4d42

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



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