Merge "Refactor off V2 Cow Ops" into main am: adad3dbe am: 7248d1b0 am:...

Merge "Refactor off V2 Cow Ops" into main am: adad3dbe am: 7248d1b0 am: 99ac415b am: aba30990

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



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