[automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours

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

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

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