Merge "Fix cow v3 size estimation errors" into main am: 442990fc am: 0408c185

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



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