Merge "Mount snapshotted /system in Virtual A/B devices" am: 5ee782079a am: bc4b2b44e9

Change-Id: I0bee847aeea87381e704aff5d26fc9d84d0ec8ac