Merge "installd: Implement support for userdata snapshot and restore." am: 1f34244f97
am: 41b277a8e6

Change-Id: Id46c2abd766a9a6e4de040bd3c57fa9973deaae2