Merge "libsnapshot: Temporarily disable flaky ImageManagerTest" am: cf4f56df9f

Change-Id: I5e717953bc7443bd883a4da62f99f5e7356b2069