Merge "Fix SnapshotManager instantiation." am: bc1165edbc

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1576377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2edb114694d02699c3809285349eecf3d41e9df3