[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package...

[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 skip reason: subject contains skip directive

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



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