Merge "installd: parameterize user data snapshots with snapshot_id" am: 8a3c8b1a94
am: bfa5131193

Change-Id: Ic32854f8ae690a7ca745a0513515b7c499f59c05