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

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

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