[automerger skipped] Merge "Delete APK snapshots during restoration (3/n)"...

[automerger skipped] Merge "Delete APK snapshots during restoration (3/n)" into rvc-dev am: 5bcc8f8a am: a514e13e am: ecc72543 -s ours am: c41248d6 -s ours

am skip reason: Change-Id I5a7540aa08922c4b0c617c9cb37e1bec2ff23fc1 with SHA-1 fda19ecd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11644366

Change-Id: Ia13b10076cee094026e7ad7d1492e131813779f7