Merge "Fix crashes when clearing storage for a protected package" into sc-dev...

Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea9 am: 0a873a62 am: 7e94a559

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

Change-Id: I86ac95c186af16a9c5cb1517eb9ff14a47b6635e