Merge "Delete APK snapshots during restoration (3/n)" into rvc-dev am: 5bcc8f8a38 am: a514e13ea4

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

Change-Id: I724c3137d3c2ef7695fae70f089ea2876c507fb1