Merge "libsnapshot: Only EnsureImageManager when it is needed."
am: 81a0738c68

Change-Id: I6b95cf1a731c4dc09a7897f3114e2ad6595d60bb