Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain...

Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f394 am: 0b65c3a3 am: 1498d5ac

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



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