Merge "Create_cow: Hash of target blocks should not be stored." into main am: a2cd2202f0 am: 8cd8ce3fc0 am: 66d0face55 am: 183f71103d

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

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