Merge "Fix failure in CowTest#InvalidMergeOrderTest." into main am: 243850ca5f am: 9591fb4e65

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

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