[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: 258b82ea -s ours

am skip reason: subject contains skip directive

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



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