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

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

Change-Id: I821a4e55fd0747c281cdf4eb70effe3babc60b11