Merge "libsnapshot: Resume snapshot merge if snapshots are in second phase"...

Merge "libsnapshot: Resume snapshot merge if snapshots are in second phase" into main am: c7cad438

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



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