[automerger skipped] Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f394 am: 0b65c3a3 am: 1498d5ac am: 92170b23 -s ours

am skip reason: subject contains skip directive

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



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