[automerger skipped] Merge "Don't remove SYSTEM_FIXED for intentional fixed...

[automerger skipped] Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." into sc-v2-dev am: 238c6d65 am: 7839a19f -s ours

am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 e6f07a4f is already in history

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

Change-Id: Id939c4d7b371bee4a0327df00771232f37ba69c0