Merge "libsnapshot: Cleanup temp metadata during rollback" into main am: 326534aa am: f670036b

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



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