Merge "Refactor off V2 Cow Ops" into main am: adad3dbefe am: 7248d1b0d8 am: 99ac415bff

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

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