Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea9 am: 732b2b0b am: e366490c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391

Change-Id: I902cd0a5f06011624fa0703423695bf0d842c412