[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am: df9bf165 am: cbf30830 -s ours

am skip reason: Change-Id I1399cab579308479d7cf191b8795441cbcd3ff65 with SHA-1 12a3f5cf is in history

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

Change-Id: Id32446478423ee72330762e01039d0d6ca8555c4