Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-dev am: 87cd3bb9

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



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