Merge "Skip carrier priv check for trusted UIDs" into rvc-dev am: f1a69729 am: a9d9ea8a am: 93b9040f

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

Change-Id: I7a9f73fc4bc14789333ba6b7c85b5fbf5077707e