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

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



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