Merge "Add VerifyMergeOps to ISnapshotWriter" am: 3ad79c8ff7

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

Change-Id: Iedbf10d71ac80e6ab808d6f34e32677d2c6cc8e6