Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." into sc-v2-dev am: 238c6d65d0

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

Change-Id: I39142a3cbd0587e6e64363ff94f04e3849593b7f