Merge "Skip carrier priv check for trusted UIDs" into rvc-dev am: f1a6972937

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

Change-Id: Iac6c6a95dc0df15e45e2ef4f25a3b92e162800b0