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

Merge "Merge "Skip carrier priv check for trusted UIDs" into rvc-dev am: f1a69729 am: a9d9ea8a am: 93b9040f" into rvc-qpr-dev-plus-aosp am: 0910c837

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

Change-Id: Ibc791d38922df4b1ea3b6c440e9025bc9c6d14f3