Merge "Ensure vts_libsnapshot_test will pass after being interrupted." am:...

Merge "Ensure vts_libsnapshot_test will pass after being interrupted." am: a06eac49 am: e3ea5e4a am: 8901f5eb am: 38d15cdb

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

Change-Id: Icd68a46d9a4e3a375d3b5278d3ec852e7d0d051c