Merge changes from topic "am-87b1f0388a1e400cb587a79ce96126ce" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-v2-dev am: 6431ce19 -s ours am: fd04b7cd -s ours am: 725d2e1c -s ours am: 44608fa4 -s ours am: 96a357ff -s ours am: 0dce8abd -s ours
  [automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: 8b9fcf30 -s ours am: 40399d22 -s ours am: 19512528 -s ours am: 81322bd3 -s ours am: 5c2aa88e -s ours am: 6111783f -s ours