[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-qpr1-dev am: 4b101489 -s ours am: e77667f9 -s ours am: d56efecd -s ours am: a1364534 -s ours am: 5d324112 -s ours am: ab0d7c99 -s ours

am skip reason: subject contains skip directive

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



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