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

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

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