Merge "Fix SnapshotManager instantiation." am: bc1165edbc am: 88a0f6edaa am: 36d5558ce0 am: 75626f2cd3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f9f618ca36dba3633fd2b6a5ebdfd655372f197