Merge "Allow Cow version v3 to be used" into main am: f7fffb62

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



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