Merge "Prevent some key system applications from losing storage permissions"...

Merge "Prevent some key system applications from losing storage permissions" into main am: 969a52a6 am: 5e4a01c4 am: 0573f4c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2673055



Change-Id: Icc002b54a13dc6fb7221eefab87eaca204daabdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>