[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: 5fdbc518 -s ours am: 615c346e -s ours am: 00a2190e -s ours

am skip reason: subject contains skip directive

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



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