Merge "installd: parameterize user data snapshots with snapshot_id"