Merge "libsnapshot: Refactor WriteSnapshotAndHash." am: 02a04511 am:...

Merge "libsnapshot: Refactor WriteSnapshotAndHash." am: 02a04511 am: 81b1c57c am: bd50fa04 am: a4f92a30 am: 852175c1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1911214



Change-Id: Ibbc7a1ed1a38d58515450486c2913cdca3e9dc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>