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

Merge "vts_libsnapshot_test: Fix test flakiness." am: 0dfbdc5b am: 9b60fd39 am: 386169c3 am: 43ef6d42

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



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