Merge "libsnapshot: Fix...

Merge "libsnapshot: Fix vts_libsnapshot_test.SnapshotUpdateTest#FullUpdateFlow" am: 58f66339 am: 57a6216c

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



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