Merge "installd: Validate volumeUuid in snapshotAppData and restoreAppDataSnapshot" am: 2470dd34e8
am: 92bb4515a5

Change-Id: Ie4b287ab65099dfe772fc0e54c40d5bcd206f5b6