[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-qpr1-dev am: 4b1014894b -s ours am: e77667f97d -s ours am: d56efecd08 -s ours am: 634b4cbc0b -s ours

am skip reason: subject contains skip directive

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

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