[automerger skipped] Merge "Delete APK snapshots during restoration (3/n)" into rvc-dev am: 5bcc8f8a38 -s ours am: 26c8c343bf -s ours am: 61caeccf7b -s ours am: 9d43fd0e37 -s ours

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

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

Change-Id: I5957422ce1f272a2329c4c330495b0ba68e9cc07