[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: 51349daf -s ours am: ab913fe9 -s ours am: 1b6291a3 -s ours am: fa5640a8 -s ours am: 6fb1d54d -s ours

am skip reason: skipped by user dvander

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



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