Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on...

Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b8805786" into android12L-tests-dev am: 5141eaf3 -s ours" into android13-tests-dev am: 5658f346 am: 5f2eb20c

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



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