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: 86c54b73 am: 1e0aa971 am: 27095a08

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



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