[automerger skipped] libsnapshot: Fix CHECK failure during second phase merge...

[automerger skipped] libsnapshot: Fix CHECK failure during second phase merge am: 739f4f5f -s ours am: 15905fde -s ours

am skip reason: Merged-In I8bf00e3016546ef7039bb0b18eb977cc3dc1066a with SHA-1 dd620ccf is already in history

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

Change-Id: I3003054018bf4ca472013ae2a787d7f81d2c0c17