[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-dev am: 87cd3bb9 am: 8df2f71a -s ours am: 368d47ce -s ours am: ab34cf4e -s ours am: d9739957 -s ours am: 81102c56 -s ours

am skip reason: subject contains skip directive

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



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