Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94

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

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