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

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

Change-Id: I4b746d8747eb8750e23a67a81dbe4d8c7dd0f255