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 am: 49129631 am: 1cf6e9bd

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



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