[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-dev am: 432eb6d7 am: ebe1be1b -s ours am: 3b69f553 -s ours am: 31b36202 -s ours am: f44f39cc -s ours am: c55ad46b -s ours am: d618ba9c -s ours am: 7306cd59 -s ours am: ff0db97c -s ours am: 58a93822 -s ours

am skip reason: subject contains skip directive

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



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