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 am: e755101e am: 2064e939 am: fc6633c3

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



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