[automerger skipped] DO NOT MERGE: libsnapshot: Fix test failures on certain...

[automerger skipped] DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b am: c287a094 am: 23b206b9 am: 5542938c -s ours am: f64a53bc -s ours am: 62277558 -s ours

am skip reason: subject contains skip directive

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



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