Merge "Allow Cow version v3 to be used" into main am: f7fffb62 am: 4bbf76fa am: 7003f716

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



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