[automerger skipped] libsnapshot: Propagate merge phase across merge failures....

[automerger skipped] libsnapshot: Propagate merge phase across merge failures. am: 6834fe66 -s ours

am skip reason: Merged-In I31fdae6bde48e3a71b6f3fcc663541257f7ebd8f with SHA-1 c2bb3ee6 is already in history

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

Change-Id: Ib3d35524f9817460b4f56369baa18d831c87ff4a