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

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

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