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

Change-Id: I766615b567ac0687969dfdb5830f19de4d51fde4