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

Change-Id: I42582c0bc338f6ea2e5fbaef72d5f96e14f36270