Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f39449 am: 86c54b73fc

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

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