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: Iced98e6437c63a086bc2eafedafe6ef8f377a692
Signed-off-by: Automerger Merge Worker <[email protected]>