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 am: 3c30f76b

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



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