Merge "libsnapshot: op_count_max default to max blocks" into main am: 5e4b3263 am: 874d5006

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



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