[automerger skipped] Merge "installd: parameterize user data snapshots with...
[automerger skipped] Merge "installd: parameterize user data snapshots with snapshot_id" am: 8a3c8b1a am: bfa51311
am: a20fc939 -s ours
am skip reason: change_id I4177a44a60cdfdc5429a28c613ce661b24482b8b with SHA1 b68f0d14 is in history
Change-Id: I7627b17fffb6749937c925498a06af3721cd92b1