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

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

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

Change-Id: If0a2e03398a67bb48271e91a1e4564f6a2f4e52b