[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 sc-v2-dev am: 6431ce19 -s ours am: fd04b7cd -s ours am: 60de120c -s ours am: 001643ce -s ours am: c6ace5b8 -s ours

am skip reason: subject contains skip directive

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



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