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

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

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



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