Merge "Add MockSnapshotMergeStats" am: 05e6076ceb am: 75834672a4

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

Change-Id: I3b7f374cff81903534ab12b438d3096cb3cc957f