Merge "libsnapshot: Fix test failures on certain configurations." into...

Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b8805786

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



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