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

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



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