[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 -s ours am: 55b5aa17 -s ours am: 6aa4ae82 -s ours

am skip reason: skipped by user dvander

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



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