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

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

Change-Id: Iaf7debb52265e584b5474586563911122901e6e6