[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 -s ours am: 26c8c343 -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: Ic0fe746182d35332eb6e92e038a9171950aa52b7