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

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

Change-Id: I32c52b8e0265148243519f3819781a0c3408a028