Merge "Skip carrier priv check for trusted UIDs" into rvc-dev am: f1a69729 am: 5169953b am: 9b6c886f

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

Change-Id: Ia901c2ed1f15bb17d6cfe2cf085dbb58ae55f498