[automerger skipped] Merge "DO NOT MERGE: libsnapshot: Fix test failures on...

[automerger skipped] Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f394 am: 86c54b73 am: 1e0aa971 am: 27095a08 -s ours am: 326fd206 -s ours

am skip reason: subject contains skip directive

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



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