[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: 634b4cbc -s ours am: aeea3c95 -s ours am: 168845ba -s ours

am skip reason: subject contains skip directive

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



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