[automerger skipped] Perform a consistency check before deleting snapshots. am: 91b351ea -s ours

am skip reason: Merged-In Ib887f1d9e4397a712ed2f800cc1222cf9305a039 with SHA-1 216f9bbc is already in history

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

Change-Id: I6b105a57587bedea068208d66df96938c2b602da