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

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

Change-Id: I34a32d6b1a534a26b3e9f355b55df72e21a04d6c
Signed-off-by: Automerger Merge Worker <[email protected]>