Merge "snapuserd: Fallback to synchronous I/O if any errors observed during async merge." am: 806c29721a

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

Change-Id: I7f46b07c6a136788960b317cc4b84310b6ab687d