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