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

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



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