Merge "libsnapshot: Remove consistency check after merge" into main am:...

Merge "libsnapshot: Remove consistency check after merge" into main am: 57b34ae3 am: 9501eb89 am: 309067c2

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



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