Merge "Merge "libsnapshot: Remove flaky image creation test." into...

Merge "Merge "libsnapshot: Remove flaky image creation test." into android13-tests-dev am: 220d4aba" am: 61c82abe

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



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