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

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



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