Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-dev am: 432eb6d7eb

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

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