Merge "libsnapshot: Fix inconsistency in how merge ops are counted." am: 16aa3c9573

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

Change-Id: I073d1478291d824c83e51f7f5f838e2a8c03c3ee