[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-qpr-dev am: 3a9e1c2b -s ours am: 82c20b69 -s ours am: 7f16e541 -s ours am: 9cdde1b1 -s ours am: 5b1db02d -s ours am: ca1abefc -s ours

am skip reason: subject contains skip directive

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



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