Merge "Skip carrier priv check for trusted UIDs" am: df9bf16543

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

Change-Id: I0c47860c86d928bf2868a2724e01c126f11d66a3