Merge "vts_libsnapshot_test: Fix test flakiness." am: 0dfbdc5b am: 9b60fd39

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



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