[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain...

[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b8805786" into android12L-tests-dev am: 5141eaf3 -s ours

am skip reason: skipped by user dvander

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



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