[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am:...

[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am: df9bf165 am: cbf30830 -s ours am: 01f398db -s ours am: 8ecdd6b7 -s ours am: 0f91b64c -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: If2e245e51cb5762672aa7010c4307a37b2b084f3