[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." am: 547654ca am: 41a0de4d am: 725eb341 -s ours am: 51924371 -s ours

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

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

Change-Id: I32b1a347b0143cd9601679e647981df4dccb9fa6