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

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

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