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: I5443d0b523edc6a2a632157294bf9e2520d9c4e2