[automerger skipped] Merge "installd: Implement support for userdata snapshot and restore." am: 1f34244f97 am: 41b277a8e6
am: 81f85bb1c6 -s ours
am skip reason: change_id I3e4d36c11e52fb885b585b1946e215cf986206fd with SHA1 e63ca7dd08 is in history

Change-Id: I8204ac85ae6b58a1e6f3462f5304c976ee86b2fb