[automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: e46bce07 am: a23179b8 -s ours am: 78f44f18 -s ours am: 79e6e2f2 -s ours am: 57eeee2a -s ours am: 49fa7075 -s ours am: e82c13a9 -s ours am: de4c4a43 -s ours am: e80f0e62 -s ours am: b4a272db -s ours

am skip reason: subject contains skip directive

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



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