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 am: 51749de3

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



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