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

Merge "[automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8 -s ours am: c39d9728 -s ours am: b5a2fdd6 -s ours am: 00e91534 -s ours" into tm-d1-dev-plus-aosp am: 54335899 -s ours

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

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



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